From 9798e6e22aacdf75793fc322f30079d57a4b9318 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Wed, 29 Jun 2022 05:23:15 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../controllers/algo/rusefi_generated.h | 6 +- .../console/binary/generated/data_logs.ini | 1 + .../binary/generated/fancy_content.ini | 1 + .../binary/generated/output_channels.ini | 171 +++++++++-------- .../console/binary/generated/sensors.java | 114 +++++------ .../generated/total_live_data_generated.h | 2 +- .../controllers/algo/engine_state_generated.h | 18 +- .../controllers/generated/rusefi_generated.h | 6 +- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../generated/signature_hellen_cypress.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 181 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 181 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 181 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 181 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 181 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 181 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 181 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 181 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 181 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 181 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 181 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 181 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 181 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 181 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 181 +++++++++--------- .../generated/rusefi_hellen_cypress.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 181 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 181 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 181 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 181 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 181 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 181 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 181 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 181 +++++++++--------- .../rusefi/config/generated/EngineState.java | 6 +- .../com/rusefi/config/generated/Fields.java | 8 +- 76 files changed, 3191 insertions(+), 3074 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 8f63708b7d..b52ea9cf43 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 829795496 +#define SIGNATURE_HASH 952361091 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen_cypress.829795496" +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen_cypress.952361091" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1024 +#define TS_TOTAL_OUTPUT_SIZE 1028 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 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 f64548a8ea..8a259d9c69 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1924,7 +1924,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1865861925 +#define SIGNATURE_HASH 1719699214 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2476,12 +2476,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.28.kin.1865861925" +#define TS_SIGNATURE "rusEFI 2022.06.29.kin.1719699214" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1024 +#define TS_TOTAL_OUTPUT_SIZE 1028 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 6c254741db..8b58a56e4d 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1904,7 +1904,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 2135431952 +#define SIGNATURE_HASH 1996379963 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2457,12 +2457,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.28.subaru_eg33_f7.2135431952" +#define TS_SIGNATURE "rusEFI 2022.06.29.subaru_eg33_f7.1996379963" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1024 +#define TS_TOTAL_OUTPUT_SIZE 1028 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index d40fafb4f0..390ee83445 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -363,6 +363,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 0d96915360..2cb4c098e0 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -147,6 +147,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 8e8b0f34a3..910324dd5e 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -454,88 +454,89 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 46afde728a..7cd2c28a02 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -332,59 +332,61 @@ targetFromTable("targetFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 820, 1.0, -1.0, -1.0, ""), dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 824, 1.0, -1.0, -1.0, ""), cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 828, 1.0, -1.0, -1.0, ""), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 832, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 856, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 916, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 917, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 918, 1.0, -20.0, 100.0, "units"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 920, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 940, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 941, 1.0, -1.0, -1.0, ""), -vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 942, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 943, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 944, 1.0, -1.0, -1.0, ""), -wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), -currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), -baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), -targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 976, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1012, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1013, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1014, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1015, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1016, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1018, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1020, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1022, 1.0, -20.0, 100.0, "units"), +hellenBoardId("How does this board self identifies", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 832, 1.0, 0.0, 3000.0, "id"), +alignmentFill_at_130("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 834, 1.0, -20.0, 100.0, "units"), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 836, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 840, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 844, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 848, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 852, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 860, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 864, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 868, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 872, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 876, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 880, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 884, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 888, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 892, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 896, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 900, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 904, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 908, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 912, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 916, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 920, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 921, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 922, 1.0, -20.0, 100.0, "units"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 924, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 928, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 932, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 936, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("triggerActualSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 940, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 944, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 945, 1.0, -1.0, -1.0, ""), +vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 946, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 947, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel injection time correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 948, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 952, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 956, 1.0, -1.0, -1.0, ""), +currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 960, 1.0, -1.0, -1.0, ""), +baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 964, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 968, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 972, 1.0, -1.0, -1.0, ""), +targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 980, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 984, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 988, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 992, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1016, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1017, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1018, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1019, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1020, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1022, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1024, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1026, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index 411ab79b2b..9694367602 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / UsagesReader.java -#define TS_TOTAL_OUTPUT_SIZE 1024 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1028 \ No newline at end of file diff --git a/firmware/controllers/algo/engine_state_generated.h b/firmware/controllers/algo/engine_state_generated.h index 2295cd752b..acbbc860f7 100644 --- a/firmware/controllers/algo/engine_state_generated.h +++ b/firmware/controllers/algo/engine_state_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -271,8 +271,20 @@ struct engine_state_s { * offset 124 */ angle_t cltTimingCorrection = (angle_t)0; + /** + * How does this board self identifies + id + * offset 128 + */ + int16_t hellenBoardId = (int16_t)0; + /** + * need 4 byte alignment + units + * offset 130 + */ + uint8_t alignmentFill_at_130[2]; }; -static_assert(sizeof(engine_state_s) == 128); +static_assert(sizeof(engine_state_s) == 132); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 5f15f3e66e..fda3ff5b81 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1952047778 +#define SIGNATURE_HASH 2112859785 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2490,12 +2490,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.06.28.all.1952047778" +#define TS_SIGNATURE "rusEFI 2022.06.29.all.2112859785" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1024 +#define TS_TOTAL_OUTPUT_SIZE 1028 #define TsCalMode_EtbKd 5 #define TsCalMode_EtbKi 4 #define TsCalMode_EtbKp 3 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 6cccc83e28..151c2893fd 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1669262061 -#define TS_SIGNATURE "rusEFI 2022.06.28.48way.1669262061" +#define SIGNATURE_HASH 1791534790 +#define TS_SIGNATURE "rusEFI 2022.06.29.48way.1791534790" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0ffc336ab1..be639fc6a7 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1952047778 -#define TS_SIGNATURE "rusEFI 2022.06.28.all.1952047778" +#define SIGNATURE_HASH 2112859785 +#define TS_SIGNATURE "rusEFI 2022.06.29.all.2112859785" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 965be52f76..f7e03359c1 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1179353038 -#define TS_SIGNATURE "rusEFI 2022.06.28.alphax-2chan.1179353038" +#define SIGNATURE_HASH 1341993957 +#define TS_SIGNATURE "rusEFI 2022.06.29.alphax-2chan.1341993957" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 745cd26e26..6b9cb8198c 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1473580513 -#define TS_SIGNATURE "rusEFI 2022.06.28.alphax-4chan.1473580513" +#define SIGNATURE_HASH 1583563210 +#define TS_SIGNATURE "rusEFI 2022.06.29.alphax-4chan.1583563210" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index e1bc0cef74..3e6da9c180 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1754470277 -#define TS_SIGNATURE "rusEFI 2022.06.28.atlas.1754470277" +#define SIGNATURE_HASH 1629838254 +#define TS_SIGNATURE "rusEFI 2022.06.29.atlas.1629838254" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index db71b3aff8..2cb68b48c6 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2192946011 -#define TS_SIGNATURE "rusEFI 2022.06.28.core8.2192946011" +#define SIGNATURE_HASH 2332295024 +#define TS_SIGNATURE "rusEFI 2022.06.29.core8.2332295024" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 086ac32be8..91ad4d2c48 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1952047778 -#define TS_SIGNATURE "rusEFI 2022.06.28.f407-discovery.1952047778" +#define SIGNATURE_HASH 2112859785 +#define TS_SIGNATURE "rusEFI 2022.06.29.f407-discovery.2112859785" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index a7cc33cd92..5151761e1a 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1952047778 -#define TS_SIGNATURE "rusEFI 2022.06.28.f429-discovery.1952047778" +#define SIGNATURE_HASH 2112859785 +#define TS_SIGNATURE "rusEFI 2022.06.29.f429-discovery.2112859785" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 5ccfeebfbc..e20fc1b33e 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 909450854 -#define TS_SIGNATURE "rusEFI 2022.06.28.frankenso_na6.909450854" +#define SIGNATURE_HASH 1065570893 +#define TS_SIGNATURE "rusEFI 2022.06.29.frankenso_na6.1065570893" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index d5e3424702..aa30280bf1 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 11910621 -#define TS_SIGNATURE "rusEFI 2022.06.28.harley81.11910621" +#define SIGNATURE_HASH 151253494 +#define TS_SIGNATURE "rusEFI 2022.06.29.harley81.151253494" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 0ce15b2f4f..98af5a36bd 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1431761863 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen-gm-e67.1431761863" +#define SIGNATURE_HASH 1558233068 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen-gm-e67.1558233068" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 543a68bdba..71e6b885b5 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2916275054 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen-nb1.2916275054" +#define SIGNATURE_HASH 2758057797 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen-nb1.2758057797" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 568b53c0f2..761fe587f9 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4236728904 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen121nissan.4236728904" +#define SIGNATURE_HASH 4113634915 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen121nissan.4113634915" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index b85f62c98e..a2c3431472 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 74981848 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen121vag.74981848" +#define SIGNATURE_HASH 231632371 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen121vag.231632371" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index e7742a17e6..1160419b98 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 443694707 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen128.443694707" +#define SIGNATURE_HASH 331641432 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen128.331641432" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 980802dcd6..b8cf56431c 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3960901670 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen154hyundai.3960901670" +#define SIGNATURE_HASH 3852524557 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen154hyundai.3852524557" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 8427b1f79e..7173dbe525 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2254883750 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen72.2254883750" +#define SIGNATURE_HASH 2412808077 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen72.2412808077" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index a38420f281..38c9df66bf 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1458322088 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen81.1458322088" +#define SIGNATURE_HASH 1599764099 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen81.1599764099" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index c439772b3d..116dc36d10 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 684598278 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen88bmw.684598278" +#define SIGNATURE_HASH 561539117 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen88bmw.561539117" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index ba0fefc7d7..03efc6075c 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4140962754 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellenNA6.4140962754" +#define SIGNATURE_HASH 4284768233 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellenNA6.4284768233" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 66f041a2ee..634916534d 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1994406034 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellenNA8_96.1994406034" +#define SIGNATURE_HASH 2136372409 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellenNA8_96.2136372409" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 3b96fc8a05..b966909b45 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 829795496 -#define TS_SIGNATURE "rusEFI 2022.06.28.hellen_cypress.829795496" +#define SIGNATURE_HASH 952361091 +#define TS_SIGNATURE "rusEFI 2022.06.29.hellen_cypress.952361091" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 4116b8db67..b5df3b88e6 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 1865861925 -#define TS_SIGNATURE "rusEFI 2022.06.28.kin.1865861925" +#define SIGNATURE_HASH 1719699214 +#define TS_SIGNATURE "rusEFI 2022.06.29.kin.1719699214" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 3e3d51992e..3b41e08eb4 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3146739284 -#define TS_SIGNATURE "rusEFI 2022.06.28.mre_f4.3146739284" +#define SIGNATURE_HASH 2990088831 +#define TS_SIGNATURE "rusEFI 2022.06.29.mre_f4.2990088831" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 12d2ff755c..e6c53ba614 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3146739284 -#define TS_SIGNATURE "rusEFI 2022.06.28.mre_f7.3146739284" +#define SIGNATURE_HASH 2990088831 +#define TS_SIGNATURE "rusEFI 2022.06.29.mre_f7.2990088831" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 317dfa2ad5..e4b25c7128 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 615725892 -#define TS_SIGNATURE "rusEFI 2022.06.28.prometheus_405.615725892" +#define SIGNATURE_HASH 755332975 +#define TS_SIGNATURE "rusEFI 2022.06.29.prometheus_405.755332975" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 959e7e2163..d63ccea524 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 615725892 -#define TS_SIGNATURE "rusEFI 2022.06.28.prometheus_469.615725892" +#define SIGNATURE_HASH 755332975 +#define TS_SIGNATURE "rusEFI 2022.06.29.prometheus_469.755332975" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 29df38ccb8..5cbebd2f3f 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3516147156 -#define TS_SIGNATURE "rusEFI 2022.06.28.proteus_f4.3516147156" +#define SIGNATURE_HASH 3626134015 +#define TS_SIGNATURE "rusEFI 2022.06.29.proteus_f4.3626134015" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 4a85050d5a..71e0477dd1 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3516147156 -#define TS_SIGNATURE "rusEFI 2022.06.28.proteus_f7.3516147156" +#define SIGNATURE_HASH 3626134015 +#define TS_SIGNATURE "rusEFI 2022.06.29.proteus_f7.3626134015" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index b7c6013a2a..2cf6fdfb79 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3516147156 -#define TS_SIGNATURE "rusEFI 2022.06.28.proteus_h7.3516147156" +#define SIGNATURE_HASH 3626134015 +#define TS_SIGNATURE "rusEFI 2022.06.29.proteus_h7.3626134015" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index b450de7a6c..19f131fd12 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 2135431952 -#define TS_SIGNATURE "rusEFI 2022.06.28.subaru_eg33_f7.2135431952" +#define SIGNATURE_HASH 1996379963 +#define TS_SIGNATURE "rusEFI 2022.06.29.subaru_eg33_f7.1996379963" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 383b6ba931..dc6fba5c0e 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3729861878 -#define TS_SIGNATURE "rusEFI 2022.06.28.tdg-pdm8.3729861878" +#define SIGNATURE_HASH 3622265053 +#define TS_SIGNATURE "rusEFI 2022.06.29.tdg-pdm8.3622265053" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index e64b815493..538a617bab 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.all.1952047778" + signature = "rusEFI 2022.06.29.all.2112859785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.all.1952047778" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.all.2112859785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:39 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 0842b0909d..d2f6bc71b7 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.48way.1669262061" + signature = "rusEFI 2022.06.29.48way.1791534790" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.48way.1669262061" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.48way.1791534790" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:22 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4915,6 +4917,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 089e83243f..64eaf00d46 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.alphax-2chan.1179353038" + signature = "rusEFI 2022.06.29.alphax-2chan.1341993957" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.alphax-2chan.1179353038" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.alphax-2chan.1341993957" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:32:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:19:55 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4912,6 +4914,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 2cbcda18c8..279c287c64 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.alphax-4chan.1473580513" + signature = "rusEFI 2022.06.29.alphax-4chan.1583563210" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.alphax-4chan.1473580513" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.alphax-4chan.1583563210" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:32:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:19:57 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4913,6 +4915,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index acd1c0e662..ef43c8ab54 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.atlas.1754470277" + signature = "rusEFI 2022.06.29.atlas.1629838254" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.atlas.1754470277" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.atlas.1629838254" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:36 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index ed4936ac6c..4d384166ab 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.core8.2192946011" + signature = "rusEFI 2022.06.29.core8.2332295024" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.core8.2192946011" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.core8.2332295024" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:21 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4915,6 +4917,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index bb8ed95618..00e0a34ff7 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.f407-discovery.1952047778" + signature = "rusEFI 2022.06.29.f407-discovery.2112859785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.f407-discovery.1952047778" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.f407-discovery.2112859785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:33 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index f2445f108f..c29c4c1f2d 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.f429-discovery.1952047778" + signature = "rusEFI 2022.06.29.f429-discovery.2112859785" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.f429-discovery.1952047778" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.f429-discovery.2112859785" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:35 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 54c8236ebe..59a6992ea7 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.frankenso_na6.909450854" + signature = "rusEFI 2022.06.29.frankenso_na6.1065570893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.frankenso_na6.909450854" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.frankenso_na6.1065570893" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:24 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 4ec5611678..c3f4ba0e8e 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.harley81.11910621" + signature = "rusEFI 2022.06.29.harley81.151253494" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.harley81.11910621" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.harley81.151253494" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:19:59 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 92f8a674d4..b44932203d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen-gm-e67.1431761863" + signature = "rusEFI 2022.06.29.hellen-gm-e67.1558233068" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen-gm-e67.1431761863" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen-gm-e67.1558233068" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:13 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 2cc9c49f15..a8cdd1687a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen-nb1.2916275054" + signature = "rusEFI 2022.06.29.hellen-nb1.2758057797" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen-nb1.2916275054" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen-nb1.2758057797" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:11 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 4da200cb2b..4e1171474b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen121nissan.4236728904" + signature = "rusEFI 2022.06.29.hellen121nissan.4113634915" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen121nissan.4236728904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen121nissan.4113634915" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:03 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 98412d7d2d..4ea07d3dd6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen121vag.74981848" + signature = "rusEFI 2022.06.29.hellen121vag.231632371" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen121vag.74981848" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen121vag.231632371" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:02 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index a1ad4bed2f..729beb240e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen128.443694707" + signature = "rusEFI 2022.06.29.hellen128.331641432" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen128.443694707" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen128.331641432" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:00 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 7e8fb73a29..93e09d2f00 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen154hyundai.3960901670" + signature = "rusEFI 2022.06.29.hellen154hyundai.3852524557" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen154hyundai.3960901670" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen154hyundai.3852524557" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:05 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index ada365660e..b86d168bfe 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen72.2254883750" + signature = "rusEFI 2022.06.29.hellen72.2412808077" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen72.2254883750" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen72.2412808077" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:08 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index c7178f50a1..1325a5f913 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen81.1458322088" + signature = "rusEFI 2022.06.29.hellen81.1599764099" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen81.1458322088" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen81.1599764099" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:10 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4913,6 +4915,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index ae4eff2786..1482af01f6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen88bmw.684598278" + signature = "rusEFI 2022.06.29.hellen88bmw.561539117" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen88bmw.684598278" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen88bmw.561539117" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:06 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index e591597124..fb57b88ca6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellenNA6.4140962754" + signature = "rusEFI 2022.06.29.hellenNA6.4284768233" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellenNA6.4140962754" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellenNA6.4284768233" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:14 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index ae75516945..2e1ab3adf5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellenNA8_96.1994406034" + signature = "rusEFI 2022.06.29.hellenNA8_96.2136372409" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellenNA8_96.1994406034" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellenNA8_96.2136372409" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:16 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 24a5c2d4f9..aaacb1e863 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.hellen_cypress.829795496" + signature = "rusEFI 2022.06.29.hellen_cypress.952361091" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.hellen_cypress.829795496" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.hellen_cypress.952361091" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Jun 28 02:33:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Jun 29 05:20:42 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index d3be345554..864d0339df 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.kin.1865861925" + signature = "rusEFI 2022.06.29.kin.1719699214" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.kin.1865861925" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.kin.1719699214" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Jun 28 02:33:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Jun 29 05:20:41 UTC 2022 pageSize = 21324 page = 1 @@ -2064,7 +2064,7 @@ tcu_32Vals = array, U08, 21316, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2526,91 +2526,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4161,6 +4162,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4879,6 +4881,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 4ade843f61..64b7309efd 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.mre_f4.3146739284" + signature = "rusEFI 2022.06.29.mre_f4.2990088831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.mre_f4.3146739284" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.mre_f4.2990088831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:19 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4915,6 +4917,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 45028d9160..63540d8311 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.mre_f7.3146739284" + signature = "rusEFI 2022.06.29.mre_f7.2990088831" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.mre_f7.3146739284" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.mre_f7.2990088831" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:18 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4915,6 +4917,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 9e791a1708..a376740ef6 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.prometheus_405.615725892" + signature = "rusEFI 2022.06.29.prometheus_405.755332975" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.prometheus_405.615725892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.prometheus_405.755332975" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:27 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4913,6 +4915,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1e3a5a72de..a77af2e4e2 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.prometheus_469.615725892" + signature = "rusEFI 2022.06.29.prometheus_469.755332975" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.prometheus_469.615725892" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.prometheus_469.755332975" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:26 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4913,6 +4915,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index e266ddcc05..1ca70d08ea 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.proteus_f4.3516147156" + signature = "rusEFI 2022.06.29.proteus_f4.3626134015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.proteus_f4.3516147156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.proteus_f4.3626134015" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:30 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4911,6 +4913,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 5894f6e9d7..2550524a4f 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.proteus_f7.3516147156" + signature = "rusEFI 2022.06.29.proteus_f7.3626134015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.proteus_f7.3516147156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.proteus_f7.3626134015" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:29 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4911,6 +4913,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index ebac696ebc..1221e46909 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.proteus_h7.3516147156" + signature = "rusEFI 2022.06.29.proteus_h7.3626134015" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.proteus_h7.3516147156" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.proteus_h7.3626134015" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:32 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4911,6 +4913,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index b9badb35a7..81d3119b01 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.subaru_eg33_f7.2135431952" + signature = "rusEFI 2022.06.29.subaru_eg33_f7.1996379963" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.subaru_eg33_f7.2135431952" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.subaru_eg33_f7.1996379963" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:44 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4914,6 +4916,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index ce5154f0ec..a7419da15c 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.06.28.tdg-pdm8.3729861878" + signature = "rusEFI 2022.06.29.tdg-pdm8.3622265053" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.06.28.tdg-pdm8.3729861878" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.06.29.tdg-pdm8.3622265053" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Jun 28 02:33:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:38 UTC 2022 pageSize = 21352 page = 1 @@ -2103,7 +2103,7 @@ tcu_32Vals = array, U08, 21344, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1024 + ochBlockSize = 1028 ; ; see TunerStudioOutputChannels struct @@ -2565,91 +2565,92 @@ targetFromTable = scalar, F32, 816, "", 1, 0 sparkDwell = scalar, F32, 820, "", 1, 0 dwellAngle = scalar, F32, 824, "", 1, 0 cltTimingCorrection = scalar, F32, 828, "", 1, 0 -; total TS size = 832 -tpsFrom = scalar, F32, 832, "", 1, 0 -tpsTo = scalar, F32, 836, "", 1, 0 -deltaTps = scalar, F32, 840, "", 1, 0 -extraFuel = scalar, F32, 844, "", 1, 0 -valueFromTable = scalar, F32, 848, "", 1, 0 -isAboveAccelThreshold = bits, U32, 852, [0:0] -isBelowDecelThreshold = bits, U32, 852, [1:1] -isTimeToResetAccumulator = bits, U32, 852, [2:2] -isFractionalEnrichment = bits, U32, 852, [3:3] -belowEpsilon = bits, U32, 852, [4:4] -tooShort = bits, U32, 852, [5:5] -fractionalInjFuel = scalar, F32, 856, "", 1, 0 -accumulatedValue = scalar, F32, 860, "", 1, 0 -maxExtraPerCycle = scalar, F32, 864, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 868, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 872, "", 1, 0 -cycleCnt = scalar, S32, 876, "", 1, 0 -; total TS size = 880 -hwEventCounters1 = scalar, S32, 880, "", 1, 0 -hwEventCounters2 = scalar, S32, 884, "", 1, 0 -hwEventCounters3 = scalar, S32, 888, "", 1, 0 -hwEventCounters4 = scalar, S32, 892, "", 1, 0 -hwEventCounters5 = scalar, S32, 896, "", 1, 0 -hwEventCounters6 = scalar, S32, 900, "", 1, 0 -vvtCamCounter = scalar, S32, 904, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 908, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 912, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 916, "", 1, 0 -mapVvt_map_peak = scalar, U08, 917, "", 1, 0 -; total TS size = 920 -totalRevolutionCounter = scalar, U32, 920, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 924, "", 1, 0 -vvtCurrentPosition = scalar, F32, 928, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 932, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 936, "", 1, 0 -triggerStateIndex = scalar, U08, 940, "", 1, 0 -vvtCounter = scalar, U08, 941, "", 1, 0 -vvtSyncCounter = scalar, U08, 942, "", 1, 0 -vvtStateIndex = scalar, U08, 943, "", 1, 0 -; total TS size = 944 -wallFuelCorrection = scalar, F32, 944, "", 1, 0 -wallFuel = scalar, F32, 948, "", 1, 0 -; total TS size = 952 -idleState = scalar, S32, 952, "", 1, 0 -currentIdlePosition = scalar, F32, 956, "", 1, 0 -baseIdlePosition = scalar, F32, 960, "", 1, 0 -iacByTpsTaper = scalar, F32, 964, "", 1, 0 -throttlePedalUpState = scalar, S32, 968, "", 1, 0 -mightResetPid = bits, U32, 972, [0:0] -shouldResetPid = bits, U32, 972, [1:1] -wasResetPid = bits, U32, 972, [2:2] -mustResetPid = bits, U32, 972, [3:3] -isCoasting = bits, U32, 972, [4:4] -useIacTableForCoasting = bits, U32, 972, [5:5] -notIdling = bits, U32, 972, [6:6] -needReset = bits, U32, 972, [7:7] -isInDeadZone = bits, U32, 972, [8:8] -isBlipping = bits, U32, 972, [9:9] -useClosedLoop = bits, U32, 972, [10:10] -badTps = bits, U32, 972, [11:11] -looksLikeRunning = bits, U32, 972, [12:12] -looksLikeCoasting = bits, U32, 972, [13:13] -looksLikeCrankToIdle = bits, U32, 972, [14:14] -useInstantRpmForIdle = bits, U32, 972, [15:15] -isVerboseIAC = bits, U32, 972, [16:16] -targetRpmByClt = scalar, S32, 976, "", 1, 0 -targetRpmAcBump = scalar, S32, 980, "", 1, 0 -; total TS size = 984 -baseDwell = scalar, F32, 984, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 988, "", 1, 0 -luaTimingAdd = scalar, F32, 992, "", 1, 0 -luaTimingMult = scalar, F32, 996, "", 1, 0 -; total TS size = 1000 -idlePosition = scalar, F32, 1000, "", 1, 0 -trim = scalar, F32, 1004, "", 1, 0 -luaAdjustment = scalar, F32, 1008, "", 1, 0 -; total TS size = 1012 -faultCode = scalar, U08, 1012, "", 1, 0 -heaterDuty = scalar, U08, 1013, "%", 1, 0 -pumpDuty = scalar, U08, 1014, "%", 1, 0 -tempC = scalar, U16, 1016, "C", 1, 0 -nernstVoltage = scalar, U16, 1018, "V", 0.001, 0 -esr = scalar, U16, 1020, "", 1, 0 -; total TS size = 1024 +hellenBoardId = scalar, S16, 832, "id", 1, 0 +; total TS size = 836 +tpsFrom = scalar, F32, 836, "", 1, 0 +tpsTo = scalar, F32, 840, "", 1, 0 +deltaTps = scalar, F32, 844, "", 1, 0 +extraFuel = scalar, F32, 848, "", 1, 0 +valueFromTable = scalar, F32, 852, "", 1, 0 +isAboveAccelThreshold = bits, U32, 856, [0:0] +isBelowDecelThreshold = bits, U32, 856, [1:1] +isTimeToResetAccumulator = bits, U32, 856, [2:2] +isFractionalEnrichment = bits, U32, 856, [3:3] +belowEpsilon = bits, U32, 856, [4:4] +tooShort = bits, U32, 856, [5:5] +fractionalInjFuel = scalar, F32, 860, "", 1, 0 +accumulatedValue = scalar, F32, 864, "", 1, 0 +maxExtraPerCycle = scalar, F32, 868, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 872, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 876, "", 1, 0 +cycleCnt = scalar, S32, 880, "", 1, 0 +; total TS size = 884 +hwEventCounters1 = scalar, S32, 884, "", 1, 0 +hwEventCounters2 = scalar, S32, 888, "", 1, 0 +hwEventCounters3 = scalar, S32, 892, "", 1, 0 +hwEventCounters4 = scalar, S32, 896, "", 1, 0 +hwEventCounters5 = scalar, S32, 900, "", 1, 0 +hwEventCounters6 = scalar, S32, 904, "", 1, 0 +vvtCamCounter = scalar, S32, 908, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 912, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 916, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 920, "", 1, 0 +mapVvt_map_peak = scalar, U08, 921, "", 1, 0 +; total TS size = 924 +totalRevolutionCounter = scalar, U32, 924, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 928, "", 1, 0 +vvtCurrentPosition = scalar, F32, 932, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 936, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 940, "", 1, 0 +triggerStateIndex = scalar, U08, 944, "", 1, 0 +vvtCounter = scalar, U08, 945, "", 1, 0 +vvtSyncCounter = scalar, U08, 946, "", 1, 0 +vvtStateIndex = scalar, U08, 947, "", 1, 0 +; total TS size = 948 +wallFuelCorrection = scalar, F32, 948, "", 1, 0 +wallFuel = scalar, F32, 952, "", 1, 0 +; total TS size = 956 +idleState = scalar, S32, 956, "", 1, 0 +currentIdlePosition = scalar, F32, 960, "", 1, 0 +baseIdlePosition = scalar, F32, 964, "", 1, 0 +iacByTpsTaper = scalar, F32, 968, "", 1, 0 +throttlePedalUpState = scalar, S32, 972, "", 1, 0 +mightResetPid = bits, U32, 976, [0:0] +shouldResetPid = bits, U32, 976, [1:1] +wasResetPid = bits, U32, 976, [2:2] +mustResetPid = bits, U32, 976, [3:3] +isCoasting = bits, U32, 976, [4:4] +useIacTableForCoasting = bits, U32, 976, [5:5] +notIdling = bits, U32, 976, [6:6] +needReset = bits, U32, 976, [7:7] +isInDeadZone = bits, U32, 976, [8:8] +isBlipping = bits, U32, 976, [9:9] +useClosedLoop = bits, U32, 976, [10:10] +badTps = bits, U32, 976, [11:11] +looksLikeRunning = bits, U32, 976, [12:12] +looksLikeCoasting = bits, U32, 976, [13:13] +looksLikeCrankToIdle = bits, U32, 976, [14:14] +useInstantRpmForIdle = bits, U32, 976, [15:15] +isVerboseIAC = bits, U32, 976, [16:16] +targetRpmByClt = scalar, S32, 980, "", 1, 0 +targetRpmAcBump = scalar, S32, 984, "", 1, 0 +; total TS size = 988 +baseDwell = scalar, F32, 988, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 992, "", 1, 0 +luaTimingAdd = scalar, F32, 996, "", 1, 0 +luaTimingMult = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +idlePosition = scalar, F32, 1004, "", 1, 0 +trim = scalar, F32, 1008, "", 1, 0 +luaAdjustment = scalar, F32, 1012, "", 1, 0 +; total TS size = 1016 +faultCode = scalar, U08, 1016, "", 1, 0 +heaterDuty = scalar, U08, 1017, "%", 1, 0 +pumpDuty = scalar, U08, 1018, "%", 1, 0 +tempC = scalar, U16, 1020, "C", 1, 0 +nernstVoltage = scalar, U16, 1022, "V", 0.001, 0 +esr = scalar, U16, 1024, "", 1, 0 +; total TS size = 1028 time = { timeNow } @@ -4200,6 +4201,7 @@ entry = targetFromTable, "targetFromTable", float, "%.3f" entry = sparkDwell, "ignition dwell duration in ms", float, "%.3f" entry = dwellAngle, "ignition dwell duration as crankshaft angle", float, "%.3f" entry = cltTimingCorrection, "cltTimingCorrection", float, "%.3f" +entry = hellenBoardId, "How does this board self identifies", int, "%d" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -4918,6 +4920,7 @@ dialog = engine_stateDialog, "engine_state" graphLine = sparkDwell graphLine = dwellAngle graphLine = cltTimingCorrection + graphLine = hellenBoardId indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index e66df84f26..9d45965e3b 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Apr 18 03:04:20 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Wed Jun 29 05:19:54 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -69,6 +69,8 @@ public class EngineState { public static final Field SPARKDWELL = Field.create("SPARKDWELL", 116, FieldType.FLOAT); public static final Field DWELLANGLE = Field.create("DWELLANGLE", 120, FieldType.FLOAT); public static final Field CLTTIMINGCORRECTION = Field.create("CLTTIMINGCORRECTION", 124, FieldType.FLOAT); + public static final Field HELLENBOARDID = Field.create("HELLENBOARDID", 128, FieldType.INT16).setScale(1.0); + public static final Field ALIGNMENTFILL_AT_130 = Field.create("ALIGNMENTFILL_AT_130", 130, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_ISTCHARGEAIRMODEL, SD_UNUSEDBIT_1_1, @@ -133,5 +135,7 @@ public class EngineState { SPARKDWELL, DWELLANGLE, CLTTIMINGCORRECTION, + HELLENBOARDID, + ALIGNMENTFILL_AT_130, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 07d760418f..71302527d2 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/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.sh integration/rusefi_config.txt Tue Jun 28 02:33:49 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Jun 29 05:20:47 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1886,7 +1886,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2066; public static final int servoOutputPins8_offset = 2068; public static final int showHumanReadableWarning_offset = 940; - public static final int SIGNATURE_HASH = 1952047778; + public static final int SIGNATURE_HASH = 2112859785; public static final int silentTriggerError_offset = 1340; public static final int skippedWheelOnCam_offset = 1340; public static final int slowAdcAlpha_offset = 1580; @@ -2373,10 +2373,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.06.28.all.1952047778"; + public static final String TS_SIGNATURE = "rusEFI 2022.06.29.all.2112859785"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1024; + public static final int TS_TOTAL_OUTPUT_SIZE = 1028; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3;