mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
84f1d7fbc2
commit
bc2f08b124
|
@ -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");
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -39,6 +39,6 @@ public class JustOneInstance {
|
|||
}
|
||||
}
|
||||
};
|
||||
new Thread(runnable).start();
|
||||
new Thread(runnable, "JustOneInstance").start();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue