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-05-11 20:04:35 -04:00
parent 47f0dfbac9
commit c4145ba7ce
2 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -3,12 +3,14 @@ package com.rusefi.binaryprotocol;
import com.rusefi.*; import com.rusefi.*;
import com.rusefi.core.Pair; import com.rusefi.core.Pair;
import com.rusefi.io.DataListener; import com.rusefi.io.DataListener;
import com.rusefi.io.serial.SerialPortReader; import com.rusefi.io.IoStream;
import com.rusefi.io.serial.SerialIoStream;
import etch.util.CircularByteBuffer; import etch.util.CircularByteBuffer;
import jssc.SerialPort; import jssc.SerialPort;
import jssc.SerialPortException; import jssc.SerialPortException;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
/** /**
@ -23,7 +25,7 @@ public class BinaryProtocol {
private static final int SWITCH_TO_BINARY_RESPONSE = 0xA7E; private static final int SWITCH_TO_BINARY_RESPONSE = 0xA7E;
private final Logger logger; private final Logger logger;
private final SerialPort serialPort; private final IoStream stream;
private static final int BUFFER_SIZE = 10000; private static final int BUFFER_SIZE = 10000;
private final CircularByteBuffer cbb; private final CircularByteBuffer cbb;
private boolean isBurnPending; private boolean isBurnPending;
@ -36,9 +38,9 @@ public class BinaryProtocol {
public static BinaryProtocol instance; public static BinaryProtocol instance;
public boolean isClosed; public boolean isClosed;
public BinaryProtocol(final Logger logger, SerialPort serialPort) { public BinaryProtocol(final Logger logger, SerialIoStream stream) {
this.logger = logger; this.logger = logger;
this.serialPort = serialPort; this.stream = stream;
instance = this; instance = this;
@ -57,11 +59,11 @@ public class BinaryProtocol {
} }
} }
}; };
try { this.stream.addEventListener(listener);
serialPort.addEventListener(new SerialPortReader(serialPort, listener)); }
} catch (SerialPortException e) {
throw new IllegalStateException(e); public BinaryProtocol(Logger logger, SerialPort serialPort) {
} this(logger, new SerialIoStream(serialPort, logger));
} }
public Logger getLogger() { public Logger getLogger() {
@ -81,7 +83,7 @@ public class BinaryProtocol {
dropPending(); dropPending();
try { try {
serialPort.writeBytes("~\n".getBytes()); stream.write("~\n".getBytes());
synchronized (cbb) { synchronized (cbb) {
boolean isTimeout = waitForBytes(2, start, "switch to binary"); boolean isTimeout = waitForBytes(2, start, "switch to binary");
if (isTimeout) { if (isTimeout) {
@ -96,7 +98,7 @@ public class BinaryProtocol {
} }
logger.info("Switched to binary protocol"); logger.info("Switched to binary protocol");
} }
} catch (SerialPortException | EOFException e) { } catch (IOException e) {
close(); close();
FileLog.MAIN.logLine("exception: " + e); FileLog.MAIN.logLine("exception: " + e);
return; return;
@ -116,12 +118,7 @@ public class BinaryProtocol {
logger.error("Unexpected pending data: " + pending + " byte(s)"); logger.error("Unexpected pending data: " + pending + " byte(s)");
cbb.get(new byte[pending]); cbb.get(new byte[pending]);
} }
try { stream.purge();
serialPort.purgePort(SerialPort.PURGE_RXCLEAR | SerialPort.PURGE_TXCLEAR);
} catch (SerialPortException e) {
logger.info("Error while purge: " + e);
close();
}
} }
} }
@ -261,7 +258,7 @@ public class BinaryProtocol {
return receivePacket(msg, allowLongResponse); return receivePacket(msg, allowLongResponse);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} catch (SerialPortException | EOFException e) { } catch (IOException e) {
logger.error(msg + ": exchange failed: " + e); logger.error(msg + ": exchange failed: " + e);
close(); close();
return null; return null;
@ -272,13 +269,7 @@ public class BinaryProtocol {
if (isClosed) if (isClosed)
return; return;
isClosed = true; isClosed = true;
try { stream.close();
FileLog.MAIN.logLine("CLOSING PORT...");
serialPort.closePort();
FileLog.MAIN.logLine("PORT CLOSED");
} catch (SerialPortException e) {
logger.error("Error closing port: " + e);
}
} }
public void writeData(byte[] content, Integer offset, int size, Logger logger) throws SerialPortException, EOFException, InterruptedException { public void writeData(byte[] content, Integer offset, int size, Logger logger) throws SerialPortException, EOFException, InterruptedException {
@ -378,10 +369,10 @@ public class BinaryProtocol {
} }
} }
private void sendCrcPacket(byte[] command) throws SerialPortException { private void sendCrcPacket(byte[] command) throws IOException {
byte[] packet = makePacket(command); byte[] packet = makePacket(command);
logger.info("Sending " + Arrays.toString(packet)); logger.info("Sending " + Arrays.toString(packet));
serialPort.writeBytes(packet); stream.write(packet);
} }
/** /**
@ -410,8 +401,7 @@ public class BinaryProtocol {
if (isClosed) if (isClosed)
return null; return null;
try { try {
byte[] response = new byte[0]; byte[] response = exchange(new byte[]{'G'}, "text", true);
response = exchange(new byte[]{'G'}, "text", true);
if (response != null && response.length == 1) if (response != null && response.length == 1)
Thread.sleep(100); Thread.sleep(100);
// System.out.println(result); // System.out.println(result);

2
java_console/io/src/com/rusefi/io/serial/PortHolder.java
View File

@ -76,7 +76,7 @@ public class PortHolder {
portLock.notifyAll(); portLock.notifyAll();
} }
bp = new BinaryProtocol(FileLog.LOGGER, serialPort); bp = new BinaryProtocol(FileLog.LOGGER, new SerialIoStream(serialPort, FileLog.LOGGER));
bp.switchToBinaryProtocol(); bp.switchToBinaryProtocol();
bp.readImage(TsPageSize.IMAGE_SIZE); bp.readImage(TsPageSize.IMAGE_SIZE);