From 041919d94082a02de605f823044d6285678597b6 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 12 Apr 2020 19:10:36 -0400 Subject: [PATCH] multi-channel Tuner Studio tooth logger #1284 reducing magic constants --- .../kinetis/config/controllers/algo/rusefi_generated.h | 1 + firmware/controllers/generated/rusefi_generated.h | 1 + firmware/integration/rusefi_config.txt | 2 ++ firmware/tunerstudio/rusefi.ini | 4 ++-- firmware/tunerstudio/rusefi.input | 2 +- firmware/tunerstudio/rusefi_frankenso.ini | 4 ++-- firmware/tunerstudio/rusefi_kinetis.ini | 9 +++++---- firmware/tunerstudio/rusefi_microrusefi.ini | 4 ++-- firmware/tunerstudio/rusefi_prometheus.ini | 4 ++-- firmware/tunerstudio/rusefi_proteus.ini | 4 ++-- .../models/src/com/rusefi/config/generated/Fields.java | 3 ++- 11 files changed, 22 insertions(+), 16 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 92a576431a..89a3bd623d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -441,6 +441,7 @@ #define coastingFuelCutTps_offset_hex c50 #define communicationLedPin_offset 1812 #define communicationLedPin_offset_hex 714 +#define COMPOSITE_PACKET_SIZE 2 #define CONSOLE_DATA_PROTOCOL_TAG " @" #define consoleLoopPeriodMs_offset 716 #define consoleLoopPeriodMs_offset_hex 2cc diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index f21e92b081..d2d05f32e8 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -441,6 +441,7 @@ #define coastingFuelCutTps_offset_hex c50 #define communicationLedPin_offset 1812 #define communicationLedPin_offset_hex 714 +#define COMPOSITE_PACKET_SIZE 2 #define CONSOLE_DATA_PROTOCOL_TAG " @" #define consoleLoopPeriodMs_offset 716 #define consoleLoopPeriodMs_offset_hex 2cc diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 6085e55d65..5810254716 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -76,6 +76,8 @@ struct_no_prefix engine_configuration_s #define TRIGGER_TYPE_60_2 8 #define TRIGGER_TYPE_36_1 9 +#define COMPOSITE_PACKET_SIZE 2 + #define MAP_ANGLE_SIZE 8 #define MAP_WINDOW_SIZE 8 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 63c8418d69..756c2abd3c 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 17:48:48 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:41 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 2b046e7ac2..1cb3cf2e05 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -117,7 +117,7 @@ enable2ndByteCanID = false dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, @@COMPOSITE_PACKET_SIZE@@ ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 85d9b6b1f7..fdb764a88e 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 17:48:55 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:48 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 5f4c27de3e..ab1cd0b273 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat Apr 11 22:16:28 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sun Apr 12 19:03:57 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" @@ -1503,8 +1503,9 @@ fileVersion = { 20200310 } debugFieldI2List = bits, U08, [0:7], "Offset", "", "", "", "Idle di2", "Channel 2 Fall Counter", "", "", "", "", "", "", "", "", "", "", "", "ETB di2", "", "", "di2", "di2", "22di2", "", "23:di2", "", "", "", "", "", "", "Latest Transmit","", "", "", "", "", "S unused" "", "" debugFieldI3List = bits, U08, [0:7], "", "", "", "", "Idle di3", "Cycle Index", "", "", "", "", "", "", "", "", "", "", "", "ETB di3", "", "", "di3", "di3", "22di3", "", "23:di3", "", "", "", "", "", "", "Latest Received","", "", "", "", "", "S unused" "", "" debugFieldI4List = bits, U08, [0:7], "", "", "", "", "Idle di4", "Cycle Cnt 1", "", "", "", "", "", "", "", "", "", "", "", "ETB di4", "", "", "di4", "di4", "22di4", "", "23:di4", "", "", "", "", "", "", "Init Count", "", "", "", "", "", "S unused" "", "" - debugFieldI5List = bits, U08, [0:7], "", "", "", "", "Idle di5", "Cycle Cnt 2", "", "", "", "", "", "", "", "", "", "di5", "di5", "ETB di5", "di5", "di5", "di5", "di5", "22di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "S di5" -"", ""[ConstantsExtensions] + debugFieldI5List = bits, U08, [0:7], "", "", "", "", "Idle di5", "Cycle Cnt 2", "", "", "", "", "", "", "", "", "", "di5", "di5", "ETB di5", "di5", "di5", "di5", "di5", "22di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "di5", "S di5" "", "" + +[ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the ; constant is used as a variable in the ini. diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 4704a9d244..291ac28e49 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 17:48:52 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:45 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 73f0190a7f..02217d098b 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 17:48:58 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:51 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 00027c3ae3..6b40588a0a 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 17:49:01 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:54 EDT 2020 pageSize = 20000 page = 1 @@ -1255,7 +1255,7 @@ page = 1 dataReadyCondition = { toothLogReady } ; recordDef = headerLen, footerLen, recordLen - recordDef = 0, 0, 2; in bytes, the recordLen is for each record, currently limited to 4 bytes + recordDef = 0, 0, 2 ; uint16 that stores 1/100 second recordField = toothTime, "tooth", 0, 16, 0.01, "ms" diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index f22b3cedc8..668d33c9eb 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat Apr 11 22:16:11 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sun Apr 12 19:03:41 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -285,6 +285,7 @@ public class Fields { public static final int coastingFuelCutTps_offset = 3152; public static final int communicationLedPin_offset = 1812; public static final int communicationLedPin_offset_hex = 714; + public static final int COMPOSITE_PACKET_SIZE = 2; public static final String CONSOLE_DATA_PROTOCOL_TAG = " @"; public static final int consoleLoopPeriodMs_offset = 716; public static final int consoleSerialRxPin_offset = 1819;