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

auto-sync

This commit is contained in:
rusEfi 2016-02-13 17:02:32 -05:00
parent 4facde3d80
commit 31965c8092
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/console/console_io.cpp
View File

@ -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

4
java_console/jssc/src/jssc/SerialPort.java
View File

@ -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);
}