From 7d1ba41db603f6f2befa0ec1369ef126422f63ab Mon Sep 17 00:00:00 2001
From: "LIN\\54376" <543769318@qq.com>
Date: Mon, 12 Jan 2026 15:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96msp=5F485=5Fandroid=E9=87=8C?=
=?UTF-8?q?=E7=9A=84=E5=8F=91=E9=80=81=E5=BB=B6=E6=97=B6=E4=B8=BA120ms?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.settings/language.settings.xml | 4 ++--
BASE/Src/MSP/msp_485_android.c | 4 ++--
Core/Src/main.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index ed7a50d..d1d79c6 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/BASE/Src/MSP/msp_485_android.c b/BASE/Src/MSP/msp_485_android.c
index b143c6d..08810a0 100644
--- a/BASE/Src/MSP/msp_485_android.c
+++ b/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;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index ad072b2..25488a9 100644
--- a/Core/Src/main.c
+++ b/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();