From a6f8985920940ae1a962be405f5059d618947a6b Mon Sep 17 00:00:00 2001 From: "LIN\\54376" <543769318@qq.com> Date: Mon, 19 Jan 2026 03:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9usb=E4=B8=B2=E5=8F=A3?= =?UTF-8?q?=E8=8A=AF=E7=89=87=EF=BC=8C=E9=80=82=E7=94=A8=E4=BA=8Ech340?= =?UTF-8?q?=E5=92=8CFIA=EF=BC=8C=E6=B3=A2=E7=89=B9=E7=8E=87=E6=94=B9?= =?UTF-8?q?=E4=B8=BA115200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/fivewheel/MainActivity.java | 2 +- .../services/USBSerialPortHelper.java | 17 +++++++---------- .../services/ttySerialPortHelper.java | 19 ------------------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/example/fivewheel/MainActivity.java b/app/src/main/java/com/example/fivewheel/MainActivity.java index 256914f..98f9e8c 100644 --- a/app/src/main/java/com/example/fivewheel/MainActivity.java +++ b/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(); 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 2306a3c..9a05a7a 100644 --- a/app/src/main/java/com/example/fivewheel/services/USBSerialPortHelper.java +++ b/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 READ_WAIT_MILLIS = 100; + private final int WRITE_WAIT_MILLIS = 50; + 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(); 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 e494647..227a01b 100644 --- a/app/src/main/java/com/example/fivewheel/services/ttySerialPortHelper.java +++ b/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])); - - } }); }