Browse Source

优化msp_485_android里的发送延时为120ms

master
LIN\54376 15 hours ago
parent
commit
7d1ba41db6
  1. 4
      .settings/language.settings.xml
  2. 4
      BASE/Src/MSP/msp_485_android.c
  3. 4
      Core/Src/main.c

4
.settings/language.settings.xml

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-822475198191542168" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="464840693227456435" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-822475198191542168" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="464840693227456435" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

4
BASE/Src/MSP/msp_485_android.c

@ -53,7 +53,7 @@ void android_485_loop()
MB_ReadHoldingReg(&android_handler->Tx_Buf, &android_handler->TxCount,
android_slave_id, 0, read_android_holidng_register_count);
android_handler->AddSendList(android_handler, android_handler->Tx_Buf,
android_handler->TxCount, OneLineWaitTime, decode_android_485);
android_handler->TxCount, 120, decode_android_485);
//设定安卓数据
pb_ostream_t IV_o_stream = pb_ostream_from_buffer(
@ -70,7 +70,7 @@ void android_485_loop()
android_slave_iv_holiding_register_num,
send_pv_android_holdingReg_Value);
android_handler->AddSendList(android_handler, android_handler->Tx_Buf,
android_handler->TxCount, OneLineWaitTime, NULL);
android_handler->TxCount, 120, NULL);
}
int PMK32Index = 0;

4
Core/Src/main.c

@ -324,9 +324,9 @@ void GF_Robot_Init()
CMCU_sensor_intialize(&RS_485_2_UART_Handler);
//Dynamometer_sensor_intialize(&RS_485_4_UART_Handler);
//client_setting_intialize(&LPUART1_UART_Handler); //安卓
client_setting_intialize(&LPUART1_UART_Handler); //安卓
//U7_Sbus_UART_Handler_intialize(&E28_SBUS_UART_Handler);
U7_Sbus_UART_Handler_intialize(&E28_SBUS_UART_Handler);
android_485_intialize(&RS_485_4_UART_Handler);
GF_BSP_FDCAN_Init();

Loading…
Cancel
Save