From e69025edaeb39f067097b21c30aba56cfc60f18b Mon Sep 17 00:00:00 2001
From: "LIN\\54376" <543769318@qq.com>
Date: Wed, 4 Feb 2026 14:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A0=E6=AD=A3=E9=80=9A=E9=81=93=E6=95=B016?=
 =?UTF-8?q?=EF=BC=8C485=E6=B3=A2=E7=89=B9=E7=8E=87115200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/example/fivewheel/MainActivity.java   | 4 ++--
 .../com/example/fivewheel/services/DataExchangeHelper.java  | 6 +++---
 .../com/example/fivewheel/services/USBSerialPortHelper.java | 2 +-
 .../com/example/fivewheel/services/ttySerialPortHelper.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/example/fivewheel/MainActivity.java b/app/src/main/java/com/example/fivewheel/MainActivity.java
index 98f9e8c..aa4cabe 100644
--- a/app/src/main/java/com/example/fivewheel/MainActivity.java
+++ b/app/src/main/java/com/example/fivewheel/MainActivity.java
@@ -555,10 +555,10 @@ public class MainActivity extends AppCompatActivity {
                         ttySerialPortHelper.ReceivedCounter++;
                         if(ttySerialPortHelper.ReceivedCounter>=8)//250*4*2
                         {
-                            ModbusRtuSlaveService.holdingRegisters[18]= 0;//不在线 sdk坏了
+                            ModbusRtuSlaveService.holdingRegisters[17]= 0;//不在线 sdk坏了
                         }else
                         {
-                            ModbusRtuSlaveService.holdingRegisters[18]= 1;//在线
+                            ModbusRtuSlaveService.holdingRegisters[17]= 1;//在线
                         }
 
                         // 使用安全的发送值获取方法（只在编辑完成后发送新值）
diff --git a/app/src/main/java/com/example/fivewheel/services/DataExchangeHelper.java b/app/src/main/java/com/example/fivewheel/services/DataExchangeHelper.java
index d74d901..7d3b222 100644
--- a/app/src/main/java/com/example/fivewheel/services/DataExchangeHelper.java
+++ b/app/src/main/java/com/example/fivewheel/services/DataExchangeHelper.java
@@ -11,7 +11,7 @@ public class DataExchangeHelper {
 
 
 
-    public static int[] decodedCH = new int[17];
+    public static int[] decodedCH = new int[16];
     static double slope = 1000.0 / (1950 - 1500);
 
     public static int[] getdecodedCH(byte[] receivedData) {
@@ -103,12 +103,12 @@ public class DataExchangeHelper {
             }
             System.arraycopy(byteArray, 0, bytesToSend, 0, byteArray.length);
 
-            ModbusRtuSlaveService.holdingRegisters[19] = (short) byteArray.length;
+            ModbusRtuSlaveService.holdingRegisters[18] = (short) byteArray.length;
             //将数据转为小端发送
             for (int i = 0; i < modifyHoldingRegisterNum; i++) {
 
 
-                ModbusRtuSlaveService.holdingRegisters[20 + i] = (short) (
+                ModbusRtuSlaveService.holdingRegisters[19 + i] = (short) (
                         ((bytesToSend[2 * i + 1] & 0xFF) << 8) |  // 高位字节
                                 bytesToSend[2 * i] & 0xFF);      // 低位字节
 
diff --git a/app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java b/app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java
index 9a05a7a..bb5cc10 100644
--- a/app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java
+++ b/app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java
@@ -45,7 +45,7 @@ public class USBSerialPortHelper implements SerialInputOutputManager.Listener {
     private String PortNameContians = "SILICON";/**/
     //    private static String PortNameContians="FTD";
     //private int baudRate = 115200;
-    private int baudRate = 38400;
+    private int baudRate = 115200;
     private boolean withIoManager = true;
 
     private BroadcastReceiver broadcastReceiver;
diff --git a/app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java b/app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java
index 227a01b..528f21f 100644
--- a/app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java
+++ b/app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java
@@ -23,7 +23,7 @@ public class ttySerialPortHelper {
     final String[] flowcons = new String[]{"NONE", "RTS/CTS", "XON/XOFF"};
 
     public static int ReceivedCounter= 0;
-    public static int[] decodedCH = new int[17];
+
 
     public static void Open() {