From faedd3e665aa95043ad386858409853303fc3e06 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 9 Jul 2020 11:51:52 -0400 Subject: [PATCH] fixing Android --- .../src/main/java/com/rusefi/app/AndroidSerial.java | 11 ++++------- android/app/src/main/java/com/rusefi/app/rusEFI.java | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/android/app/src/main/java/com/rusefi/app/AndroidSerial.java b/android/app/src/main/java/com/rusefi/app/AndroidSerial.java index f2f1e49c8e..fe3f243bf5 100644 --- a/android/app/src/main/java/com/rusefi/app/AndroidSerial.java +++ b/android/app/src/main/java/com/rusefi/app/AndroidSerial.java @@ -19,6 +19,7 @@ import java.util.List; public class AndroidSerial implements IoStream { private static final int ST_CDC = 0x5740; + private final IncomingDataBuffer dataBuffer; private boolean isClosed; private UsbSerialPort usbSerialPort; @@ -31,18 +32,14 @@ public class AndroidSerial implements IoStream { return prober.findAllDrivers(usbManager); } - public AndroidSerial(UsbSerialPort usbSerialPort) { + public AndroidSerial(UsbSerialPort usbSerialPort, Logger logger) { this.usbSerialPort = usbSerialPort; - } - - @Override - public void setDataBuffer(IncomingDataBuffer dataBuffer) { - + dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger); } @Override public IncomingDataBuffer getDataBuffer() { - return null; + return dataBuffer; } @Override diff --git a/android/app/src/main/java/com/rusefi/app/rusEFI.java b/android/app/src/main/java/com/rusefi/app/rusEFI.java index 863ef5067e..ad6414ede8 100644 --- a/android/app/src/main/java/com/rusefi/app/rusEFI.java +++ b/android/app/src/main/java/com/rusefi/app/rusEFI.java @@ -233,7 +233,7 @@ public class rusEFI extends Activity { port.open(connection); port.setParameters(115200, 8, UsbSerialPort.STOPBITS_1, UsbSerialPort.PARITY_NONE); - AndroidSerial serial = new AndroidSerial(port); + AndroidSerial serial = new AndroidSerial(port, Logger.CONSOLE); mResultView.append("Switching to DFU\n"); DfuHelper.sendDfuRebootCommand(serial, new StringBuilder(), Logger.CONSOLE);