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

mostly logging improvements

This commit is contained in:
rusefillc 2021-12-06 12:24:48 -05:00
parent d819cfb04a
commit b820a9c49c
6 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ public class BinaryProtocol {
public boolean connectAndReadConfiguration(DataListener listener) {
try {
signature = getSignature(stream);
System.out.println("BinaryProtocol: Got " + signature + " signature");
log.info("Got " + signature + " signature");
SignatureHelper.downloadIfNotAvailable(SignatureHelper.getUrl(signature));
} catch (IOException e) {
return false;
@ -378,8 +378,8 @@ public class BinaryProtocol {
byte[] response = executeCommand(packet, "load image offset=" + offset);
if (!checkResponseCode(response, (byte) Fields.TS_RESPONSE_OK) || response.length != requestSize + 1) {
String code = (response == null || response.length == 0) ? "empty" : "code " + getCode(response);
String info = response == null ? "NO RESPONSE" : (code + " size " + response.length);
String code = (response == null || response.length == 0) ? "empty" : "ERROR_CODE=" + getCode(response);
String info = response == null ? "NO RESPONSE" : (code + " length=" + response.length);
log.info("readImage: ERROR UNEXPECTED Something is wrong, retrying... " + info);
continue;
}
@ -411,6 +411,8 @@ public class BinaryProtocol {
return "OUT_OF_RANGE";
case TS_RESPONSE_FRAMING_ERROR:
return "FRAMING_ERROR";
case TS_RESPONSE_UNDERRUN:
return "TS_RESPONSE_UNDERRUN";
}
return Integer.toString(b);
}
@ -438,9 +440,9 @@ public class BinaryProtocol {
// that's unusual - most of the protocol is LITTLE_ENDIAN
bb.order(ByteOrder.BIG_ENDIAN);
int crcFromController = bb.getInt();
log.info(String.format("From rusEFI tune CRC32 0x%x %d\n", crcFromController, crcFromController));
log.info(String.format("rusEFI says tune CRC32 0x%x %d\n", crcFromController, crcFromController));
short crc16FromController = (short) crcFromController;
log.info(String.format("From rusEFI tune CRC16 0x%x %d\n", crc16FromController, crc16FromController));
log.info(String.format("rusEFI says tune CRC16 0x%x %d\n", crc16FromController, crc16FromController));
if (crcOfLocallyCachedConfiguration == crcFromController) {
return localCached;
}

2
java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java
View File

@ -159,7 +159,7 @@ public class IncomingDataBuffer {
log.error("dropPending: Unexpected pending data: " + pending + " byte(s)");
byte[] bytes = new byte[pending];
cbb.get(bytes);
log.error("data: " + Arrays.toString(bytes));
log.error("DROPPED FROM BUFFER: " + IoStream.printByteArray(bytes));
}
}
}

2
java_console/io/src/main/java/com/rusefi/io/can/IsoTpCanDecoder.java
View File

@ -49,7 +49,7 @@ public class IsoTpCanDecoder {
case ISO_TP_FRAME_CONSECUTIVE:
frameIdx = data[0] & 0xf;
if (this.waitingForNumBytes < 0 || this.waitingForFrameIndex != frameIdx) {
throw new IllegalStateException("ISO_TP_FRAME_CONSECUTIVE: That's an abnormal situation, and we probably should react? " + waitingForNumBytes + " " + waitingForFrameIndex + " " + frameIdx);
throw new IllegalStateException("ISO_TP_FRAME_CONSECUTIVE: That's an abnormal situation, and we probably should react? waitingForNumBytes=" + waitingForNumBytes + " waitingForFrameIndex=" + waitingForFrameIndex + " frameIdx=" + frameIdx);
}
this.waitingForFrameIndex = (this.waitingForFrameIndex + 1) & 0xf;
numBytesAvailable = Math.min(this.waitingForNumBytes, 7);

2
java_console/io/src/main/java/com/rusefi/io/can/IsoTpConnector.java
View File

@ -4,7 +4,7 @@ import com.devexperts.logging.Logging;
import com.rusefi.io.IoStream;
public abstract class IsoTpConnector {
private final static Logging log = Logging.getLogging(Elm327Connector.class);
private final static Logging log = Logging.getLogging(IsoTpConnector.class);
public static void sendStrategy(byte[] bytes, IsoTpConnector connector) {
log.info("-------sendBytesToCan " + bytes.length + " byte(s):");

3
java_console/io/src/test/java/com/rusefi/binaryprotocol/test/PCanIoStream.java
View File

@ -44,7 +44,6 @@ public class PCanIoStream extends AbstractIoStream {
@Override
public void receiveData() {
System.out.println("empty receiveData");
}
};
@ -91,7 +90,7 @@ public class PCanIoStream extends AbstractIoStream {
byte[] decode = canDecoder.decodePacket(rx.getData());
listener.onDataArrived(decode);
System.out.println("Decoded " + IoStream.printByteArray(decode));
// System.out.println("Decoded " + IoStream.printByteArray(decode));
} else {
// System.out.println(new Date() + ": Receive " + status);
}

34
java_console/io/src/test/java/com/rusefi/binaryprotocol/test/PCanSandbox.java
View File

@ -1,11 +1,19 @@
package com.rusefi.binaryprotocol.test;
import com.opensr5.ConfigurationImage;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.BinaryProtocolState;
import com.rusefi.config.generated.Fields;
import com.rusefi.io.ConnectionStateListener;
import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.StreamConnector;
import peak.can.basic.*;
import java.io.IOException;
/**
* @see Elm327Sandbox
*/
public class PCanSandbox {
public static final TPCANHandle CHANNEL = TPCANHandle.PCAN_USBBUS1;
@ -22,7 +30,7 @@ public class PCanSandbox {
PCanIoStream tsStream = new PCanIoStream(can);
/*
{
String signature = BinaryProtocol.getSignature(tsStream);
System.out.println("Got " + signature + " signature via PCAN");
@ -41,5 +49,29 @@ public class PCanSandbox {
System.out.println("****************************************");
System.out.println("********* PCAN LOOKS GREAT ***********");
System.out.println("****************************************");
*/
LinkManager linkManager = new LinkManager();
StreamConnector streamConnector = new StreamConnector(linkManager, () -> tsStream);
linkManager.setConnector(streamConnector);
streamConnector.connectAndReadConfiguration(new ConnectionStateListener() {
@Override
public void onConnectionEstablished() {
System.out.println("onConnectionEstablished");
}
@Override
public void onConnectionFailed() {
System.out.println("onConnectionFailed");
}
});
BinaryProtocol currentStreamState = linkManager.getCurrentStreamState();
if (currentStreamState == null) {
System.out.println("No BinaryProtocol");
} else {
BinaryProtocolState binaryProtocolState = currentStreamState.getBinaryProtocolState();
ConfigurationImage ci = binaryProtocolState.getControllerConfiguration();
System.out.println("Got ConfigurationImage " + ci);
System.exit(0);
}
}
}