rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RusEFI console keeps resetting on latest #4899 

more error state
This commit is contained in:
rusefillc 2022-12-17 09:58:46 -05:00
parent 28b4a03e0f
commit 6366dd0e72
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -220,20 +220,29 @@ public class BinaryProtocol {
// FileLog.rlog("queue: " + LinkManager.COMMUNICATION_QUEUE.toString());
if (linkManager.COMMUNICATION_QUEUE.isEmpty() && linkManager.getNeedPullData()) {
linkManager.submit(new Runnable() {
private final boolean verbose = false; // todo: programmatically detect run under gradle?
@Override
public void run() {
isGoodOutputChannels = requestOutputChannels();
if (verbose)
System.out.println("requestOutputChannels " + isGoodOutputChannels);
if (isGoodOutputChannels)
HeartBeatListeners.onDataArrived();
binaryProtocolLogger.compositeLogic(BinaryProtocol.this);
if (linkManager.isNeedPullText()) {
String text = requestPendingMessages();
if (text != null)
String text = requestPendingTextMessages();
if (text != null) {
textListener.onDataArrived((text + "\r\n").getBytes());
if (verbose)
System.out.println("textListener");
}
}
if (linkManager.isNeedPullLiveData()) {
LiveDocsRegistry.LiveDataProvider liveDataProvider = LiveDocsRegistry.getLiveDataProvider();
LiveDocsRegistry.INSTANCE.refresh(liveDataProvider);
if (verbose)
System.out.println("Got livedata");
}
}
});
@ -564,13 +573,19 @@ public class BinaryProtocol {
return text.getBytes();
}
private String requestPendingMessages() {
private String requestPendingTextMessages() {
if (isClosed)
return null;
try {
byte[] response = executeCommand(Fields.TS_GET_TEXT, "text");
if (response != null && response.length == 1)
if (response == null) {
log.error("ERROR: TS_GET_TEXT failed");
return null;
}
if (response != null && response.length == 1) {
// todo: what is this sleep doing exactly?
Thread.sleep(100);
}
return new String(response, 1, response.length - 1);
} catch (InterruptedException e) {
log.error(e.toString());