diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp index 27b96973cb..73885d88f9 100644 --- a/firmware/console/console_io.cpp +++ b/firmware/console/console_io.cpp @@ -163,7 +163,7 @@ bool_t consoleInBinaryMode = false; ts_channel_s binaryConsole; -static THD_WORKING_AREA(consoleThreadStack, 2 * UTILITY_THREAD_STACK_SIZE); +static THD_WORKING_AREA(consoleThreadStack, 3 * UTILITY_THREAD_STACK_SIZE); static msg_t consoleThreadThreadEntryPoint(void *arg) { (void) arg; chRegSetThreadName("console thread"); diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 9cb984106f..3bbc0bfb5d 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -275,5 +275,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20151112; + return 20151124; } diff --git a/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java b/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java index f43d9d1a4f..3cd132619d 100644 --- a/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java +++ b/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java @@ -18,9 +18,7 @@ public class TcpConnector implements LinkConnector { public final static int DEFAULT_PORT = 29001; public static final String LOCALHOST = "localhost"; private final int port; - private boolean withError; - private BufferedInputStream stream; -// private IoStream ioStream; + // private IoStream ioStream; private BinaryProtocol bp; public TcpConnector(String port) { @@ -39,7 +37,7 @@ public class TcpConnector implements LinkConnector { return false; } } - +/* public static String doUnpackConfirmation(String message) { String confirmation = message.substring(CommandQueue.CONFIRMATION_PREFIX.length()); int index = confirmation.indexOf(":"); @@ -58,7 +56,7 @@ public class TcpConnector implements LinkConnector { } return confirmation.substring(0, length); } - +*/ static class InvalidTcpPort extends Exception { } @@ -72,12 +70,12 @@ public class TcpConnector implements LinkConnector { /** * this implementation is blocking - * @param listener */ @Override public void connect(LinkManager.LinkStateListener listener) { FileLog.MAIN.logLine("Connecting to " + port); OutputStream os; + BufferedInputStream stream; try { Socket socket = new Socket(LOCALHOST, port); os = socket.getOutputStream(); @@ -119,7 +117,7 @@ public class TcpConnector implements LinkConnector { @Override public boolean hasError() { - return withError; + return false; } @Override diff --git a/java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java b/java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java index e27ef896e1..e801229bdc 100644 --- a/java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java +++ b/java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java @@ -39,6 +39,6 @@ public class JustOneInstance { } } }; - new Thread(runnable).start(); + new Thread(runnable, "JustOneInstance").start(); } }