rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

helping Android

This commit is contained in:
rusefi 2020-07-25 15:37:42 -04:00
parent 923a289166
commit 5d91702272
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/com/rusefi/app/AndroidSerial.java
View File

@ -49,7 +49,7 @@ public class AndroidSerial extends AbstractIoStream {
@Override
public void setInputListener(DataListener listener) {
ByteReader reader = buffer -> usbSerialPort.read(buffer, 5000);
ByteReader.runReaderLoop("", listener, reader, TcpIoStream.DisconnectListener.VOID);
ByteReader.runReaderLoop("", listener, reader, TcpIoStream.DisconnectListener.VOID, this);
}
@Override

5
java_console/io/src/main/java/com/rusefi/io/ByteReader.java
View File

@ -4,6 +4,7 @@ import com.devexperts.logging.Logging;
import com.opensr5.io.DataListener;
import com.rusefi.NamedThreadFactory;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.serial.AbstractIoStream;
import com.rusefi.io.tcp.TcpIoStream;
import java.io.IOException;
@ -19,7 +20,7 @@ public interface ByteReader {
Logging log = getLogging(ByteReader.class);
static void runReaderLoop(String loggingPrefix, DataListener listener, ByteReader reader, TcpIoStream.DisconnectListener disconnectListener, TcpIoStream tcpIoStream) {
static void runReaderLoop(String loggingPrefix, DataListener listener, ByteReader reader, TcpIoStream.DisconnectListener disconnectListener, AbstractIoStream ioStream) {
/**
* Threading of the whole input/output does not look healthy at all!
*
@ -31,7 +32,7 @@ public interface ByteReader {
log.info(loggingPrefix + "Running TCP connection loop");
byte inputBuffer[] = new byte[Fields.BLOCKING_FACTOR * 2];
while (!tcpIoStream.isClosed()) {
while (!ioStream.isClosed()) {
try {
int result = reader.read(inputBuffer);
if (result == -1)