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

auto-sync

This commit is contained in:
rusEfi 2016-06-04 16:02:50 -04:00
parent 4771373ae7
commit 406a9aeb68
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java_console/models/src/com/rusefi/core/EngineState.java
View File

@ -36,6 +36,9 @@ public class EngineState {
registerStringValueAction(key, callback); registerStringValueAction(key, callback);
} }
/**
* text protocol key and callback associated with this key
*/
private static class StringActionPair extends Pair<String, ValueCallback<String>> { private static class StringActionPair extends Pair<String, ValueCallback<String>> {
public final String prefix; public final String prefix;
@ -206,8 +209,21 @@ public class EngineState {
} }
if (originalResponse.length() == response.length()) { if (originalResponse.length() == response.length()) {
FileLog.MAIN.logLine("EngineState.unknown: " + response); FileLog.MAIN.logLine("EngineState.unknown: " + response);
// discarding invalid line int keyEnd = response.indexOf(SEPARATOR);
return ""; if (keyEnd == -1) {
// discarding invalid line
return "";
}
String unknownKey = response.substring(0, keyEnd);
int valueEnd = response.indexOf(SEPARATOR, keyEnd + 1);
if (valueEnd == -1) {
// discarding invalid line
return "";
}
String value = response.substring(keyEnd, valueEnd);
FileLog.MAIN.logLine("Invalid key [" + unknownKey + "] value [" + value + "]");
// trying to process the rest of the line
response = response.substring(valueEnd + SEPARATOR.length());
} }
return response; return response;
} }

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -36,7 +36,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel * @see EngineSnifferPanel
*/ */
public class Launcher { public class Launcher {
public static final int CONSOLE_VERSION = 20160528; public static final int CONSOLE_VERSION = 20160604;
public static final boolean SHOW_STIMULATOR = false; public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab"; private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port"; protected static final String PORT_KEY = "port";