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() {