修改usb串口芯片，适用于ch340和FIA，波特率改为115200

app/src/main/java/com/example/fivewheel/MainActivity.java

@@ -520,7 +520,7 @@ public class MainActivity extends AppCompatActivity {
 
 
         /* USB串口 控制区域*/
-        serialPortHelper = new USBSerialPortHelper(this, 38400);
+        serialPortHelper = new USBSerialPortHelper(this, 115200);
         serialPortHelper.intialize();
         serialPortHelper.connect();
 

app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java

@@ -40,8 +40,8 @@ public class USBSerialPortHelper implements SerialInputOutputManager.Listener {
     private int deviceId = 60000;
     private int deviceId_test = 60000;
     private int portNum;
-    private final int WRITE_WAIT_MILLIS = 500;
+    private final int WRITE_WAIT_MILLIS = 50;
-    private final int READ_WAIT_MILLIS = 100;
+    private final int READ_WAIT_MILLIS = 50;
     private String PortNameContians = "SILICON";/**/
     //    private static String PortNameContians="FTD";
     //private int baudRate = 115200;
@@ -92,8 +92,8 @@ public class USBSerialPortHelper implements SerialInputOutputManager.Listener {
         UsbManager usbManager = (UsbManager) MainActivity.getSystemService(Context.USB_SERVICE);
         for (UsbDevice v : usbManager.getDeviceList().values()) {
             // status(v.getManufacturerName().toUpperCase());
-
+           // if (v.getVendorId() == 6790)
-            if (v.getVendorId() == 6790) {
+                if (v.getVendorId() == 1027||v.getVendorId() == 6790) {
                 device = v;
                 break;
             }
@@ -236,20 +236,17 @@ public class USBSerialPortHelper implements SerialInputOutputManager.Listener {
         // MainActivity.mainBinding.message.setText(str);
     }
 
-    int Index = 0;
-
-
     private void decodeRceive(byte[] data) {
         try {
 
             MainActivity.USBSerialPortReceivedTimeCounter=0;//计算时间 归零
 
             if (ModbusRtuSlaveService.processModbusRequest(data, data.length) == 0x03) {
-                Index++;
-                //Index=128;
-                //由于 System.currentTimeMillis() 会随着时间累加，所以不存在
 
 
+                MainActivity._toSendPV = MainActivity._toSendPV.toBuilder()
+                        .setTimeStamp(System.currentTimeMillis())
+                        .build();
                 DataExchangeHelper.setModbusPVValues( MainActivity._toSendPV);
             } else if (ModbusRtuSlaveService.processModbusRequest(data, data.length) == 0x10) {
                 BspIV.IV_struct_define iv = DataExchangeHelper.getIVByModbus();

app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java

@@ -62,25 +62,6 @@ public class ttySerialPortHelper {
                             }
 
                             ReceivedCounter=0;
-
-//                            MainActivity.mainBinding.sbusCH0.setText(String.valueOf(DataExchangeHelper.decodedCH[0]));
-//                            MainActivity.mainBinding.sbusCH1.setText(String.valueOf(DataExchangeHelper.decodedCH[1]));
-//                            MainActivity.mainBinding.sbusCH2.setText(String.valueOf(DataExchangeHelper.decodedCH[2]));
-//                            MainActivity.mainBinding.sbusCH3.setText(String.valueOf(DataExchangeHelper.decodedCH[3]));
-//                            MainActivity.mainBinding.sbusCH4.setText(String.valueOf(DataExchangeHelper.decodedCH[4]));
-//                            MainActivity.mainBinding.sbusCH5.setText(String.valueOf(DataExchangeHelper.decodedCH[5]));
-//                            MainActivity.mainBinding.sbusCH6.setText(String.valueOf(DataExchangeHelper.decodedCH[6]));
-//                            MainActivity.mainBinding.sbusCH7.setText(String.valueOf(DataExchangeHelper.decodedCH[7]));
-//                            MainActivity.mainBinding.sbusCH8.setText(String.valueOf(DataExchangeHelper.decodedCH[8]));
-//                            MainActivity.mainBinding.sbusCH9.setText(String.valueOf(DataExchangeHelper.decodedCH[9]));
-//                            MainActivity.mainBinding.sbusCH10.setText(String.valueOf(DataExchangeHelper.decodedCH[10]));
-//                            MainActivity.mainBinding.sbusCH11.setText(String.valueOf(DataExchangeHelper.decodedCH[11]));
-//                            MainActivity.mainBinding.sbusCH12.setText(String.valueOf(DataExchangeHelper.decodedCH[12]));
-//                            MainActivity.mainBinding.sbusCH13.setText(String.valueOf(DataExchangeHelper.decodedCH[13]));
-//                            MainActivity.mainBinding.sbusCH14.setText(String.valueOf(DataExchangeHelper.decodedCH[14]));
-//                            MainActivity.mainBinding.sbusCH15.setText(String.valueOf(DataExchangeHelper.decodedCH[15]));
-
-
                         }
                     });
                 }