From 8107435e37a1a8e88309ac2a53fc35ab0d401b0a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 18 Nov 2023 01:22:23 -0500 Subject: [PATCH] better Lua template --- .../java/com/rusefi/can/analysis/PerSidDump.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rusefi/can/analysis/PerSidDump.java b/src/main/java/com/rusefi/can/analysis/PerSidDump.java index 889223b..2fd3cde 100644 --- a/src/main/java/com/rusefi/can/analysis/PerSidDump.java +++ b/src/main/java/com/rusefi/can/analysis/PerSidDump.java @@ -50,20 +50,26 @@ public class PerSidDump { String middleOutputFileName = filteredDestinationFolder + File.separator + simpleFileName + "_filtered_" + dualSid(sid, "_") + "_middle.txt"; PrintWriter middle = new PrintWriter(new FileOutputStream(middleOutputFileName)); - String payloadVariableName = "payload" + middlePacket.getId(); - String variableName = "CAN_" + middlePacket.getId() + "_" + Integer.toHexString(middlePacket.getId()); + String decAndHex = middlePacket.getId() + "_" + Integer.toHexString(middlePacket.getId()); + String payloadVariableName = "payload" + decAndHex; + String variableName = "CAN_" + decAndHex; StringBuilder payloadLine = middlePacket.asLua(payloadVariableName); middle.println(variableName + " = " + middlePacket.getId()); middle.println(payloadLine); + String counterVariable = "counter" + decAndHex; + middle.println(); - String methodName = "onMotor" + middlePacket.getId(); + middle.println(counterVariable + " = 0"); + String methodName = "onMotor" + decAndHex; middle.println("function " + methodName + "(bus, id, dlc, data)"); + middle.println("\t" + counterVariable + " = (" + counterVariable + " + 1) % 256"); + middle.println("\t" + payloadVariableName + "[x] = " + counterVariable); //middle.println("\tprint ('MOTOR_" + middlePacket.getId() + "' " ..) - middle.println("\ttxCan(TCU_BUS, " + variableName + ", 0, " + payloadVariableName + ")"); + middle.println("\ttxCan(VEHICLE_BUS, " + variableName + ", 0, " + payloadVariableName + ")"); middle.println("end"); middle.println();