From 6210c7b9bbc0acf7edf076f6cbdf35ffb3e39e5d Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sat, 13 Feb 2016 17:02:32 -0500 Subject: [PATCH] auto-sync --- firmware/console/console_io.cpp | 8 ++++---- java_console/jssc/src/jssc/SerialPort.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/console/console_io.cpp b/firmware/console/console_io.cpp index 8f54e19005..d71e08095f 100644 --- a/firmware/console/console_io.cpp +++ b/firmware/console/console_io.cpp @@ -201,13 +201,13 @@ static THD_FUNCTION(consoleThreadThreadEntryPoint, arg) { } } -void consolePutChar(int x) { - chSequentialStreamPut(getConsoleChannel(), (uint8_t )(x)); -} - // 10 seconds #define CONSOLE_WRITE_TIMEOUT 10000 +void consolePutChar(int x) { + chnWriteTimeout(getConsoleChannel(), (const uint8_t *)&x, 1, CONSOLE_WRITE_TIMEOUT); +} + void consoleOutputBuffer(const uint8_t *buf, int size) { lastWriteSize = size; #if !EFI_UART_ECHO_TEST_MODE diff --git a/java_console/jssc/src/jssc/SerialPort.java b/java_console/jssc/src/jssc/SerialPort.java index 7bf43887c6..a5921509fa 100644 --- a/java_console/jssc/src/jssc/SerialPort.java +++ b/java_console/jssc/src/jssc/SerialPort.java @@ -153,7 +153,7 @@ public class SerialPort { public boolean openPort() throws SerialPortException { Throwable e = new Throwable(); e.printStackTrace(); - log("openPort"); + log("openPort " + portName); if(portOpened){ throw new SerialPortException(portName, "openPort()", SerialPortException.TYPE_PORT_ALREADY_OPENED); } @@ -244,7 +244,7 @@ public class SerialPort { * @throws SerialPortException */ public boolean purgePort(int flags) throws SerialPortException { - log("purgePort " + flags); + log("purgePort flags=" + flags); checkPortOpened("purgePort()"); return serialInterface.purgePort(portHandle, flags); }