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

auto-sync

This commit is contained in:
rusEfi 2015-11-24 23:03:17 -05:00
parent 84f1d7fbc2
commit bc2f08b124
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/console/console_io.cpp
View File

@ -163,7 +163,7 @@ bool_t consoleInBinaryMode = false;
ts_channel_s binaryConsole; 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) { static msg_t consoleThreadThreadEntryPoint(void *arg) {
(void) arg; (void) arg;
chRegSetThreadName("console thread"); chRegSetThreadName("console thread");

2
firmware/rusefi.cpp
View File

@ -275,5 +275,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20151112; return 20151124;
} }

12
java_console/io/src/com/rusefi/io/tcp/TcpConnector.java
View File

@ -18,9 +18,7 @@ public class TcpConnector implements LinkConnector {
public final static int DEFAULT_PORT = 29001; public final static int DEFAULT_PORT = 29001;
public static final String LOCALHOST = "localhost"; public static final String LOCALHOST = "localhost";
private final int port; private final int port;
private boolean withError; // private IoStream ioStream;
private BufferedInputStream stream;
// private IoStream ioStream;
private BinaryProtocol bp; private BinaryProtocol bp;
public TcpConnector(String port) { public TcpConnector(String port) {
@ -39,7 +37,7 @@ public class TcpConnector implements LinkConnector {
return false; return false;
} }
} }
/*
public static String doUnpackConfirmation(String message) { public static String doUnpackConfirmation(String message) {
String confirmation = message.substring(CommandQueue.CONFIRMATION_PREFIX.length()); String confirmation = message.substring(CommandQueue.CONFIRMATION_PREFIX.length());
int index = confirmation.indexOf(":"); int index = confirmation.indexOf(":");
@ -58,7 +56,7 @@ public class TcpConnector implements LinkConnector {
} }
return confirmation.substring(0, length); return confirmation.substring(0, length);
} }
*/
static class InvalidTcpPort extends Exception { static class InvalidTcpPort extends Exception {
} }
@ -72,12 +70,12 @@ public class TcpConnector implements LinkConnector {
/** /**
* this implementation is blocking * this implementation is blocking
* @param listener
*/ */
@Override @Override
public void connect(LinkManager.LinkStateListener listener) { public void connect(LinkManager.LinkStateListener listener) {
FileLog.MAIN.logLine("Connecting to " + port); FileLog.MAIN.logLine("Connecting to " + port);
OutputStream os; OutputStream os;
BufferedInputStream stream;
try { try {
Socket socket = new Socket(LOCALHOST, port); Socket socket = new Socket(LOCALHOST, port);
os = socket.getOutputStream(); os = socket.getOutputStream();
@ -119,7 +117,7 @@ public class TcpConnector implements LinkConnector {
@Override @Override
public boolean hasError() { public boolean hasError() {
return withError; return false;
} }
@Override @Override

2
java_console/ui/src/com/rusefi/ui/util/JustOneInstance.java
View File

@ -39,6 +39,6 @@ public class JustOneInstance {
} }
} }
}; };
new Thread(runnable).start(); new Thread(runnable, "JustOneInstance").start();
} }
} }