From dc86c76c9a3698c4f0fecbb25c9983f1ba9cca13 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 22 Aug 2022 15:19:58 +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 | 2 + .../binary/generated/fancy_content.ini | 2 + .../binary/generated/output_channels.ini | 262 ++++++++--------- .../console/binary/generated/sensors.java | 124 ++++---- .../generated/total_live_data_generated.h | 2 +- .../controllers/algo/engine_state_generated.h | 14 +- .../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 +- .../controllers/generated/signature_cypress.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 +- .../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 | 274 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 274 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 274 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 274 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 274 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 274 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 274 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 274 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 274 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 274 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 274 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 274 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 274 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 274 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 274 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 274 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 274 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 274 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 274 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 274 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 274 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 274 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 274 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 274 +++++++++--------- .../rusefi/config/generated/EngineState.java | 6 +- .../com/rusefi/config/generated/Fields.java | 7 +- 76 files changed, 4776 insertions(+), 4563 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index c5c60bd75d..1e5ad97a4a 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1941,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2288281700 +#define SIGNATURE_HASH 1992782882 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,12 +2496,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.08.22.cypress.2288281700" +#define TS_SIGNATURE "rusEFI 2022.08.22.cypress.1992782882" #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 1208 +#define TS_TOTAL_OUTPUT_SIZE 1216 #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 38d4071581..2cff0e3260 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1941,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3769879208 +#define SIGNATURE_HASH 504420078 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,12 +2496,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.08.22.kin.3769879208" +#define TS_SIGNATURE "rusEFI 2022.08.22.kin.504420078" #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 1208 +#define TS_TOTAL_OUTPUT_SIZE 1216 #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 f7baca6b63..3ae069312d 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 @@ -1907,7 +1907,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3327778780 +#define SIGNATURE_HASH 955958170 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2463,12 +2463,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.08.22.subaru_eg33_f7.3327778780" +#define TS_SIGNATURE "rusEFI 2022.08.22.subaru_eg33_f7.955958170" #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 1208 +#define TS_TOTAL_OUTPUT_SIZE 1216 #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 dd1aae9cfc..70073fa5d5 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -370,6 +370,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" 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 863bf369a0..d98b63cf77 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -161,6 +161,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 f16598e132..67cb561c75 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -902,134 +902,136 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index f22a2bbf2d..89e18d0ce5 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -424,64 +424,66 @@ cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldTy timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 986, 0.01, -20.0, 20.0, "deg"), timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 988, 0.01, -20.0, 20.0, "deg"), hellenBoardId("Detected Board ID", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 990, 1.0, 0.0, 3000.0, "id"), -tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), -tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), -deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), -extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), -valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), -fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), -accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1024, 1.0, -1.0, -1.0, ""), -maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), -maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), -maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, -1.0, -1.0, ""), -cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), -hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), -hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), -hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), -hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), -hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, -1.0, -1.0, ""), -hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), -vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), -mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -10000.0, 10000.0, ""), -mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1080, 1.0, -10000.0, 10000.0, ""), -mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1081, 1.0, -10000.0, 10000.0, ""), -alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1082, 1.0, -20.0, 100.0, "units"), -totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1088, 1.0, -10000.0, 10000.0, ""), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1092, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -10000.0, 10000.0, ""), -triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -1.0, -1.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1104, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1105, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1106, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1107, 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, 1108, 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, 1112, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1116, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1120, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 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, 1132, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1140, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1144, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), -baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), -dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), -luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), -luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), -idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), -trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), -luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -10000.0, 10000.0, "%"), -faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1196, 1.0, -1.0, -1.0, ""), -heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1197, 1.0, 0.0, 100.0, "%"), -pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1198, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1199, 1.0, -20.0, 100.0, "units"), -tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1200, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1202, 0.001, 0.0, 1.0, "V"), -esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1204, 1.0, -1.0, -1.0, ""), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1206, 1.0, -20.0, 100.0, "units"), +egt1("egt1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 996, 1.0, -1.0, -1.0, ""), +egt2("egt2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1000, 1.0, -1.0, -1.0, ""), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1004, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1008, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1012, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1016, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1020, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1028, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1032, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1036, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1040, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1044, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1048, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Hardware events since boot 1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1052, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Hardware events since boot 2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1056, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Hardware events since boot 3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1060, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Hardware events since boot 4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1064, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Hardware events since boot 5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1068, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Hardware events since boot 6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1072, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1076, 1.0, -1.0, -1.0, ""), +mapVvt_MAP_AT_SPECIAL_POINT("mapVvt_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1080, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_DIFF("mapVvt_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1084, 1.0, -10000.0, 10000.0, ""), +mapVvt_MAP_AT_CYCLE_COUNT("mapVvt_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1088, 1.0, -10000.0, 10000.0, ""), +mapVvt_map_peak("mapVvt_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1089, 1.0, -10000.0, 10000.0, ""), +alignmentFill_at_38("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1090, 1.0, -20.0, 100.0, "units"), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1092, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1096, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1100, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1104, 1.0, -10000.0, 10000.0, ""), +triggerActualSyncGapRatio("trigger: unused field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1108, 1.0, -1.0, -1.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1112, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1113, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1114, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1115, 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, 1116, 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, 1120, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1124, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1128, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1132, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1136, 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, 1140, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1148, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1152, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1156, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1160, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1164, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1168, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1172, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1176, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1180, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1184, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1188, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1192, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1196, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1200, 1.0, -10000.0, 10000.0, "%"), +faultCode("faultCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1204, 1.0, -1.0, -1.0, ""), +heaterDuty("heaterDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1205, 1.0, 0.0, 100.0, "%"), +pumpDuty("pumpDuty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1206, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1207, 1.0, -20.0, 100.0, "units"), +tempC("tempC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1208, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("nernstVoltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1210, 0.001, 0.0, 1.0, "V"), +esr("esr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1212, 1.0, -1.0, -1.0, ""), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1214, 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 479ebb926b..eb104e1a25 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 1208 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1216 \ 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 145a7a4b9a..6bb73b4ecb 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 Fri Jul 08 04:44:35 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 22 15:18:36 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -492,8 +492,16 @@ struct engine_state_s { /** offset 136 bit 31 */ bool unusedBit_22_31 : 1 {}; + /** + * offset 140 + */ + float egt1 = (float)0; + /** + * offset 144 + */ + float egt2 = (float)0; }; -static_assert(sizeof(engine_state_s) == 140); +static_assert(sizeof(engine_state_s) == 148); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Fri Jul 08 04:44:35 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 22 15:18:36 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 1e13b4b8e8..c32b59a3bb 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1941,7 +1941,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2288281700 +#define SIGNATURE_HASH 1992782882 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2496,12 +2496,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.08.22.all.2288281700" +#define TS_SIGNATURE "rusEFI 2022.08.22.all.1992782882" #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 1208 +#define TS_TOTAL_OUTPUT_SIZE 1216 #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 1dd662e710..294c7359f3 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 2671992875 -#define TS_SIGNATURE "rusEFI 2022.08.22.48way.2671992875" +#define SIGNATURE_HASH 1642101869 +#define TS_SIGNATURE "rusEFI 2022.08.22.48way.1642101869" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 70679e4550..daee2fbd51 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 2288281700 -#define TS_SIGNATURE "rusEFI 2022.08.22.all.2288281700" +#define SIGNATURE_HASH 1992782882 +#define TS_SIGNATURE "rusEFI 2022.08.22.all.1992782882" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 7689c275fc..9942e4402e 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 3128358152 -#define TS_SIGNATURE "rusEFI 2022.08.22.alphax-2chan.3128358152" +#define SIGNATURE_HASH 1154869582 +#define TS_SIGNATURE "rusEFI 2022.08.22.alphax-2chan.1154869582" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 5f1fdfeee1..354968990a 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 58239979 -#define TS_SIGNATURE "rusEFI 2022.08.22.alphax-4chan.58239979" +#define SIGNATURE_HASH 4259035053 +#define TS_SIGNATURE "rusEFI 2022.08.22.alphax-4chan.4259035053" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index d9943d428b..9ed82080fc 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 2494471491 -#define TS_SIGNATURE "rusEFI 2022.08.22.atlas.2494471491" +#define SIGNATURE_HASH 1779269893 +#define TS_SIGNATURE "rusEFI 2022.08.22.atlas.1779269893" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 4b3737604a..1a9aadf8d0 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 2122856861 -#define TS_SIGNATURE "rusEFI 2022.08.22.core8.2122856861" +#define SIGNATURE_HASH 2150311387 +#define TS_SIGNATURE "rusEFI 2022.08.22.core8.2150311387" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 01d0a21600..e3a589b81f 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_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 2288281700 -#define TS_SIGNATURE "rusEFI 2022.08.22.cypress.2288281700" +#define SIGNATURE_HASH 1992782882 +#define TS_SIGNATURE "rusEFI 2022.08.22.cypress.1992782882" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 179f8f1f3d..7f47d05d7d 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 2288281700 -#define TS_SIGNATURE "rusEFI 2022.08.22.f407-discovery.2288281700" +#define SIGNATURE_HASH 1992782882 +#define TS_SIGNATURE "rusEFI 2022.08.22.f407-discovery.1992782882" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 865665d90a..5cf9e800ef 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 2288281700 -#define TS_SIGNATURE "rusEFI 2022.08.22.f429-discovery.2288281700" +#define SIGNATURE_HASH 1992782882 +#define TS_SIGNATURE "rusEFI 2022.08.22.f429-discovery.1992782882" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 4beb4ac2ae..d7c92fd66e 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 3389559968 -#define TS_SIGNATURE "rusEFI 2022.08.22.frankenso_na6.3389559968" +#define SIGNATURE_HASH 883656934 +#define TS_SIGNATURE "rusEFI 2022.08.22.frankenso_na6.883656934" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 6adaec6ac3..52b5459542 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 2023320907 -#define TS_SIGNATURE "rusEFI 2022.08.22.harley81.2023320907" +#define SIGNATURE_HASH 2251976973 +#define TS_SIGNATURE "rusEFI 2022.08.22.harley81.2251976973" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 1c3375831a..efdb3d77e3 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 1006890450 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen-gm-e67.1006890450" +#define SIGNATURE_HASH 3265327508 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen-gm-e67.3265327508" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 96d3034561..261faa1b09 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 1374640552 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen-nb1.1374640552" +#define SIGNATURE_HASH 2941011438 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen-nb1.2941011438" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 7862a61121..4bbe7e80df 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 12243086 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen121nissan.12243086" +#define SIGNATURE_HASH 4263103688 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen121nissan.4263103688" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 70405fe79b..fda3000440 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 4165315358 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen121vag.4165315358" +#define SIGNATURE_HASH 115783512 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen121vag.115783512" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 770c45e802..f11db12de8 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 1989825882 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen128.1989825882" +#define SIGNATURE_HASH 2285455644 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen128.2285455644" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 7f1adce9ff..97ce783ea3 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 271260384 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen154hyundai.271260384" +#define SIGNATURE_HASH 4001892006 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen154hyundai.4001892006" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 21c83c38b6..753295b32a 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 2052800864 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen72.2052800864" +#define SIGNATURE_HASH 2230869286 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen72.2230869286" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index bf29093759..d417ab43db 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 2865868910 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen81.2865868910" +#define SIGNATURE_HASH 1416801320 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen81.1416801320" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 7b6350a83e..146c147f5a 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 2643557288 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellen88bmw.2643557288" +#define SIGNATURE_HASH 1664247790 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellen88bmw.1664247790" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 5ab8fd8c7f..b4780830c5 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 183474436 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellenNA6.183474436" +#define SIGNATURE_HASH 4098655554 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellenNA6.4098655554" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 3b045e5d13..c165da0af6 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 678287756 -#define TS_SIGNATURE "rusEFI 2022.08.22.hellenNA8_96.678287756" +#define SIGNATURE_HASH 3603875274 +#define TS_SIGNATURE "rusEFI 2022.08.22.hellenNA8_96.3603875274" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 2892008063..462f8599bd 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 3769879208 -#define TS_SIGNATURE "rusEFI 2022.08.22.kin.3769879208" +#define SIGNATURE_HASH 504420078 +#define TS_SIGNATURE "rusEFI 2022.08.22.kin.504420078" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 32a2dfdb2c..69c619d344 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 1202906258 -#define TS_SIGNATURE "rusEFI 2022.08.22.mre_f4.1202906258" +#define SIGNATURE_HASH 3104962772 +#define TS_SIGNATURE "rusEFI 2022.08.22.mre_f4.3104962772" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 4634193087..119c0c8804 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 1202906258 -#define TS_SIGNATURE "rusEFI 2022.08.22.mre_f7.1202906258" +#define SIGNATURE_HASH 3104962772 +#define TS_SIGNATURE "rusEFI 2022.08.22.mre_f7.3104962772" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 1638893e55..dcba70a19f 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 3633230210 -#define TS_SIGNATURE "rusEFI 2022.08.22.prometheus_405.3633230210" +#define SIGNATURE_HASH 640527812 +#define TS_SIGNATURE "rusEFI 2022.08.22.prometheus_405.640527812" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 374cafbc17..dca26f5b25 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 3633230210 -#define TS_SIGNATURE "rusEFI 2022.08.22.prometheus_469.3633230210" +#define SIGNATURE_HASH 640527812 +#define TS_SIGNATURE "rusEFI 2022.08.22.prometheus_469.640527812" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f5660b9998..e843b3b757 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 766095122 -#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_f4.766095122" +#define SIGNATURE_HASH 3540693844 +#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_f4.3540693844" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 752036f4fa..3b3fb49c17 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 766095122 -#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_f7.766095122" +#define SIGNATURE_HASH 3540693844 +#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_f7.3540693844" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index a1911241d4..aee1789464 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 766095122 -#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_h7.766095122" +#define SIGNATURE_HASH 3540693844 +#define TS_SIGNATURE "rusEFI 2022.08.22.proteus_h7.3540693844" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index a8ff10eebc..b940a6e437 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 3327778780 -#define TS_SIGNATURE "rusEFI 2022.08.22.subaru_eg33_f7.3327778780" +#define SIGNATURE_HASH 955958170 +#define TS_SIGNATURE "rusEFI 2022.08.22.subaru_eg33_f7.955958170" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 511608d261..6f4de631ae 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 577545776 -#define TS_SIGNATURE "rusEFI 2022.08.22.tdg-pdm8.577545776" +#define SIGNATURE_HASH 3704601206 +#define TS_SIGNATURE "rusEFI 2022.08.22.tdg-pdm8.3704601206" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 15cb4be468..38b16f49f1 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.all.2288281700" + signature = "rusEFI 2022.08.22.all.1992782882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.all.2288281700" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.all.1992782882" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:42 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 add8ce606a..84fd2b3f86 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.48way.2671992875" + signature = "rusEFI 2022.08.22.48way.1642101869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.48way.2671992875" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.48way.1642101869" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:19 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5459,6 +5463,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 aaa3c9663b..71ea5a9104 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.alphax-2chan.3128358152" + signature = "rusEFI 2022.08.22.alphax-2chan.1154869582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.alphax-2chan.3128358152" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.alphax-2chan.1154869582" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:43 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5456,6 +5460,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 1230eac872..a6cc13dffc 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.alphax-4chan.58239979" + signature = "rusEFI 2022.08.22.alphax-4chan.4259035053" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.alphax-4chan.58239979" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.alphax-4chan.4259035053" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:46 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 776d760384..8956305ef2 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.atlas.2494471491" + signature = "rusEFI 2022.08.22.atlas.1779269893" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.atlas.2494471491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.atlas.1779269893" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:38 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 19f859b33c..d32a8f3665 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.core8.2122856861" + signature = "rusEFI 2022.08.22.core8.2150311387" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.core8.2122856861" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.core8.2150311387" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:17 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5459,6 +5463,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index b203631a8e..53a34f3120 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.cypress.2288281700" + signature = "rusEFI 2022.08.22.cypress.1992782882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.cypress.2288281700" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.cypress.1992782882" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Aug 22 15:18:40 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 e271fe9bac..6c244037a8 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.f407-discovery.2288281700" + signature = "rusEFI 2022.08.22.f407-discovery.1992782882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.f407-discovery.2288281700" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.f407-discovery.1992782882" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:34 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 e172a3a06b..969adc9213 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.f429-discovery.2288281700" + signature = "rusEFI 2022.08.22.f429-discovery.1992782882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.f429-discovery.2288281700" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.f429-discovery.1992782882" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:36 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 9e358bf583..c2951d57aa 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.frankenso_na6.3389559968" + signature = "rusEFI 2022.08.22.frankenso_na6.883656934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.frankenso_na6.3389559968" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.frankenso_na6.883656934" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:21 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 ba2f9005e2..ebbe6a397b 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.harley81.2023320907" + signature = "rusEFI 2022.08.22.harley81.2251976973" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.harley81.2023320907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.harley81.2251976973" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:48 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 fe0c47fa2b..b50c617d97 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen-gm-e67.1006890450" + signature = "rusEFI 2022.08.22.hellen-gm-e67.3265327508" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen-gm-e67.1006890450" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen-gm-e67.3265327508" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:06 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 b2ed288f1f..84d04fb86c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen-nb1.1374640552" + signature = "rusEFI 2022.08.22.hellen-nb1.2941011438" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen-nb1.1374640552" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen-nb1.2941011438" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:04 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 ed008d18a6..80b74197ba 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen121nissan.12243086" + signature = "rusEFI 2022.08.22.hellen121nissan.4263103688" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen121nissan.12243086" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen121nissan.4263103688" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:54 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 0e36a2ea20..c586cd23ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen121vag.4165315358" + signature = "rusEFI 2022.08.22.hellen121vag.115783512" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen121vag.4165315358" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen121vag.115783512" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:52 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 80a45668d7..8d22b21e16 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen128.1989825882" + signature = "rusEFI 2022.08.22.hellen128.2285455644" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen128.1989825882" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen128.2285455644" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:50 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 7d2c90f083..3b1d0e9246 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen154hyundai.271260384" + signature = "rusEFI 2022.08.22.hellen154hyundai.4001892006" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen154hyundai.271260384" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen154hyundai.4001892006" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:56 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 d5505a884b..09bfe00b5b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen72.2052800864" + signature = "rusEFI 2022.08.22.hellen72.2230869286" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen72.2052800864" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen72.2230869286" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:00 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 70952b7109..c0d9c3a11c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen81.2865868910" + signature = "rusEFI 2022.08.22.hellen81.1416801320" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen81.2865868910" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen81.1416801320" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:02 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5457,6 +5461,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 69ba016e3c..c4ab5d164f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellen88bmw.2643557288" + signature = "rusEFI 2022.08.22.hellen88bmw.1664247790" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellen88bmw.2643557288" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellen88bmw.1664247790" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:18:58 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 17532a6077..42a766b3c3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellenNA6.183474436" + signature = "rusEFI 2022.08.22.hellenNA6.4098655554" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellenNA6.183474436" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellenNA6.4098655554" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:08 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 4a099be1b0..ae8215efd4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.hellenNA8_96.678287756" + signature = "rusEFI 2022.08.22.hellenNA8_96.3603875274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.hellenNA8_96.678287756" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.hellenNA8_96.3603875274" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:11 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 9b6ee06a2c..87f8bc17f9 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.kin.3769879208" + signature = "rusEFI 2022.08.22.kin.504420078" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.kin.3769879208" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.kin.504420078" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Aug 22 15:18:38 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 8baa679e3c..d04d7de01b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.mre_f4.1202906258" + signature = "rusEFI 2022.08.22.mre_f4.3104962772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.mre_f4.1202906258" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.mre_f4.3104962772" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:15 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5459,6 +5463,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 38b7672fd5..a3af027a90 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.mre_f7.1202906258" + signature = "rusEFI 2022.08.22.mre_f7.3104962772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.mre_f7.1202906258" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.mre_f7.3104962772" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:13 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5459,6 +5463,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 cbc5444a4f..059650bcf5 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.prometheus_405.3633230210" + signature = "rusEFI 2022.08.22.prometheus_405.640527812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.prometheus_405.3633230210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.prometheus_405.640527812" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:25 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5457,6 +5461,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 dab573d41c..2a587023a3 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.prometheus_469.3633230210" + signature = "rusEFI 2022.08.22.prometheus_469.640527812" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.prometheus_469.3633230210" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.prometheus_469.640527812" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:23 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5457,6 +5461,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 1ae235e9af..348cd289bd 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.proteus_f4.766095122" + signature = "rusEFI 2022.08.22.proteus_f4.3540693844" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.proteus_f4.766095122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.proteus_f4.3540693844" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:29 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5455,6 +5459,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 56e925606b..ed5833801d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.proteus_f7.766095122" + signature = "rusEFI 2022.08.22.proteus_f7.3540693844" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.proteus_f7.766095122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.proteus_f7.3540693844" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:26 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:27 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5455,6 +5459,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 b70a6f2867..ae7cc0f262 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.proteus_h7.766095122" + signature = "rusEFI 2022.08.22.proteus_h7.3540693844" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.proteus_h7.766095122" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.proteus_h7.3540693844" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:32 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5455,6 +5459,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 0a8e19ac81..534c58c706 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.subaru_eg33_f7.3327778780" + signature = "rusEFI 2022.08.22.subaru_eg33_f7.955958170" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.subaru_eg33_f7.3327778780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.subaru_eg33_f7.955958170" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:56:44 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 Mon Aug 22 15:18:42 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5458,6 +5462,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 575695a7a5..d302b6a785 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.22.tdg-pdm8.577545776" + signature = "rusEFI 2022.08.22.tdg-pdm8.3704601206" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.22.tdg-pdm8.577545776" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.22.tdg-pdm8.3704601206" ; 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 @@ -86,7 +86,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 Mon Aug 22 01:57:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:40 UTC 2022 pageSize = 21300 page = 1 @@ -2109,7 +2109,7 @@ tcu_32Vals = array, U08, 21292, [8], "%", 1, 0, 0, 255, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1208 + ochBlockSize = 1216 ; ; see TunerStudioOutputChannels struct @@ -3019,137 +3019,139 @@ unusedBit_22_28 = bits, U32, 992, [28:28] unusedBit_22_29 = bits, U32, 992, [29:29] unusedBit_22_30 = bits, U32, 992, [30:30] unusedBit_22_31 = bits, U32, 992, [31:31] -; total TS size = 996 -tpsFrom = scalar, F32, 996 -tpsTo = scalar, F32, 1000 -deltaTps = scalar, F32, 1004 -extraFuel = scalar, F32, 1008, "", 1, 0 -valueFromTable = scalar, F32, 1012, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1016, [0:0] -isBelowDecelThreshold = bits, U32, 1016, [1:1] -isTimeToResetAccumulator = bits, U32, 1016, [2:2] -isFractionalEnrichment = bits, U32, 1016, [3:3] -belowEpsilon = bits, U32, 1016, [4:4] -tooShort = bits, U32, 1016, [5:5] -unusedBit_11_6 = bits, U32, 1016, [6:6] -unusedBit_11_7 = bits, U32, 1016, [7:7] -unusedBit_11_8 = bits, U32, 1016, [8:8] -unusedBit_11_9 = bits, U32, 1016, [9:9] -unusedBit_11_10 = bits, U32, 1016, [10:10] -unusedBit_11_11 = bits, U32, 1016, [11:11] -unusedBit_11_12 = bits, U32, 1016, [12:12] -unusedBit_11_13 = bits, U32, 1016, [13:13] -unusedBit_11_14 = bits, U32, 1016, [14:14] -unusedBit_11_15 = bits, U32, 1016, [15:15] -unusedBit_11_16 = bits, U32, 1016, [16:16] -unusedBit_11_17 = bits, U32, 1016, [17:17] -unusedBit_11_18 = bits, U32, 1016, [18:18] -unusedBit_11_19 = bits, U32, 1016, [19:19] -unusedBit_11_20 = bits, U32, 1016, [20:20] -unusedBit_11_21 = bits, U32, 1016, [21:21] -unusedBit_11_22 = bits, U32, 1016, [22:22] -unusedBit_11_23 = bits, U32, 1016, [23:23] -unusedBit_11_24 = bits, U32, 1016, [24:24] -unusedBit_11_25 = bits, U32, 1016, [25:25] -unusedBit_11_26 = bits, U32, 1016, [26:26] -unusedBit_11_27 = bits, U32, 1016, [27:27] -unusedBit_11_28 = bits, U32, 1016, [28:28] -unusedBit_11_29 = bits, U32, 1016, [29:29] -unusedBit_11_30 = bits, U32, 1016, [30:30] -unusedBit_11_31 = bits, U32, 1016, [31:31] -fractionalInjFuel = scalar, F32, 1020, "", 1, 0 -accumulatedValue = scalar, F32, 1024, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1028, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1032, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1036, "", 1, 0 -cycleCnt = scalar, S32, 1040, "", 1, 0 -; total TS size = 1044 -hwEventCounters1 = scalar, S32, 1044, "", 1, 0 -hwEventCounters2 = scalar, S32, 1048, "", 1, 0 -hwEventCounters3 = scalar, S32, 1052, "", 1, 0 -hwEventCounters4 = scalar, S32, 1056, "", 1, 0 -hwEventCounters5 = scalar, S32, 1060, "", 1, 0 -hwEventCounters6 = scalar, S32, 1064, "", 1, 0 -vvtCamCounter = scalar, S32, 1068, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1072, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1076, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1080, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1081, "", 1, 0 -; total TS size = 1084 -totalRevolutionCounter = scalar, U32, 1084, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1088, "", 1, 0 -vvtCurrentPosition = scalar, F32, 1092, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1096, "", 1, 0 -triggerActualSyncGapRatio = scalar, F32, 1100, "", 1, 0 -triggerStateIndex = scalar, U08, 1104, "", 1, 0 -vvtCounter = scalar, U08, 1105, "", 1, 0 -camResyncCounter = scalar, U08, 1106, "", 1, 0 -vvtStateIndex = scalar, U08, 1107, "", 1, 0 -; total TS size = 1108 -wallFuelCorrection = scalar, F32, 1108, "", 1, 0 -wallFuel = scalar, F32, 1112, "", 1, 0 +egt1 = scalar, F32, 996, "", 1, 0 +egt2 = scalar, F32, 1000, "", 1, 0 +; total TS size = 1004 +tpsFrom = scalar, F32, 1004 +tpsTo = scalar, F32, 1008 +deltaTps = scalar, F32, 1012 +extraFuel = scalar, F32, 1016, "", 1, 0 +valueFromTable = scalar, F32, 1020, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1024, [0:0] +isBelowDecelThreshold = bits, U32, 1024, [1:1] +isTimeToResetAccumulator = bits, U32, 1024, [2:2] +isFractionalEnrichment = bits, U32, 1024, [3:3] +belowEpsilon = bits, U32, 1024, [4:4] +tooShort = bits, U32, 1024, [5:5] +unusedBit_11_6 = bits, U32, 1024, [6:6] +unusedBit_11_7 = bits, U32, 1024, [7:7] +unusedBit_11_8 = bits, U32, 1024, [8:8] +unusedBit_11_9 = bits, U32, 1024, [9:9] +unusedBit_11_10 = bits, U32, 1024, [10:10] +unusedBit_11_11 = bits, U32, 1024, [11:11] +unusedBit_11_12 = bits, U32, 1024, [12:12] +unusedBit_11_13 = bits, U32, 1024, [13:13] +unusedBit_11_14 = bits, U32, 1024, [14:14] +unusedBit_11_15 = bits, U32, 1024, [15:15] +unusedBit_11_16 = bits, U32, 1024, [16:16] +unusedBit_11_17 = bits, U32, 1024, [17:17] +unusedBit_11_18 = bits, U32, 1024, [18:18] +unusedBit_11_19 = bits, U32, 1024, [19:19] +unusedBit_11_20 = bits, U32, 1024, [20:20] +unusedBit_11_21 = bits, U32, 1024, [21:21] +unusedBit_11_22 = bits, U32, 1024, [22:22] +unusedBit_11_23 = bits, U32, 1024, [23:23] +unusedBit_11_24 = bits, U32, 1024, [24:24] +unusedBit_11_25 = bits, U32, 1024, [25:25] +unusedBit_11_26 = bits, U32, 1024, [26:26] +unusedBit_11_27 = bits, U32, 1024, [27:27] +unusedBit_11_28 = bits, U32, 1024, [28:28] +unusedBit_11_29 = bits, U32, 1024, [29:29] +unusedBit_11_30 = bits, U32, 1024, [30:30] +unusedBit_11_31 = bits, U32, 1024, [31:31] +fractionalInjFuel = scalar, F32, 1028, "", 1, 0 +accumulatedValue = scalar, F32, 1032, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1036, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1040, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1044, "", 1, 0 +cycleCnt = scalar, S32, 1048, "", 1, 0 +; total TS size = 1052 +hwEventCounters1 = scalar, S32, 1052, "", 1, 0 +hwEventCounters2 = scalar, S32, 1056, "", 1, 0 +hwEventCounters3 = scalar, S32, 1060, "", 1, 0 +hwEventCounters4 = scalar, S32, 1064, "", 1, 0 +hwEventCounters5 = scalar, S32, 1068, "", 1, 0 +hwEventCounters6 = scalar, S32, 1072, "", 1, 0 +vvtCamCounter = scalar, S32, 1076, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1080, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1084, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1088, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1089, "", 1, 0 +; total TS size = 1092 +totalRevolutionCounter = scalar, U32, 1092, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1096, "", 1, 0 +vvtCurrentPosition = scalar, F32, 1100, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1104, "", 1, 0 +triggerActualSyncGapRatio = scalar, F32, 1108, "", 1, 0 +triggerStateIndex = scalar, U08, 1112, "", 1, 0 +vvtCounter = scalar, U08, 1113, "", 1, 0 +camResyncCounter = scalar, U08, 1114, "", 1, 0 +vvtStateIndex = scalar, U08, 1115, "", 1, 0 ; total TS size = 1116 -idleState = bits, S32, 1116, [0:2], "not important" -currentIdlePosition = scalar, F32, 1120 -baseIdlePosition = scalar, F32, 1124 -iacByTpsTaper = scalar, F32, 1128 -throttlePedalUpState = scalar, S32, 1132, "", 1, 0 -mightResetPid = bits, U32, 1136, [0:0] -shouldResetPid = bits, U32, 1136, [1:1] -wasResetPid = bits, U32, 1136, [2:2] -mustResetPid = bits, U32, 1136, [3:3] -isCoasting = bits, U32, 1136, [4:4] -useIacTableForCoasting = bits, U32, 1136, [5:5] -notIdling = bits, U32, 1136, [6:6] -needReset = bits, U32, 1136, [7:7] -isInDeadZone = bits, U32, 1136, [8:8] -isBlipping = bits, U32, 1136, [9:9] -useClosedLoop = bits, U32, 1136, [10:10] -badTps = bits, U32, 1136, [11:11] -looksLikeRunning = bits, U32, 1136, [12:12] -looksLikeCoasting = bits, U32, 1136, [13:13] -looksLikeCrankToIdle = bits, U32, 1136, [14:14] -useInstantRpmForIdle = bits, U32, 1136, [15:15] -isVerboseIAC = bits, U32, 1136, [16:16] -unusedBit_22_17 = bits, U32, 1136, [17:17] -unusedBit_22_18 = bits, U32, 1136, [18:18] -unusedBit_22_19 = bits, U32, 1136, [19:19] -unusedBit_22_20 = bits, U32, 1136, [20:20] -unusedBit_22_21 = bits, U32, 1136, [21:21] -unusedBit_22_22 = bits, U32, 1136, [22:22] -unusedBit_22_23 = bits, U32, 1136, [23:23] -unusedBit_22_24 = bits, U32, 1136, [24:24] -unusedBit_22_25 = bits, U32, 1136, [25:25] -unusedBit_22_26 = bits, U32, 1136, [26:26] -unusedBit_22_27 = bits, U32, 1136, [27:27] -unusedBit_22_28 = bits, U32, 1136, [28:28] -unusedBit_22_29 = bits, U32, 1136, [29:29] -unusedBit_22_30 = bits, U32, 1136, [30:30] -unusedBit_22_31 = bits, U32, 1136, [31:31] -targetRpmByClt = scalar, S32, 1140, "", 1, 0 -targetRpmAcBump = scalar, S32, 1144, "", 1, 0 -iacByRpmTaper = scalar, F32, 1148 -luaAdd = scalar, F32, 1152 -; total TS size = 1156 -baseDwell = scalar, F32, 1156, "", 1, 0 -dwellVoltageCorrection = scalar, F32, 1160, "", 1, 0 -luaTimingAdd = scalar, F32, 1164, "", 1, 0 -luaTimingMult = scalar, F32, 1168, "", 1, 0 -; total TS size = 1172 -idlePosition = scalar, F32, 1172, "", 1, 0 -trim = scalar, F32, 1176, "", 1, 0 -luaAdjustment = scalar, F32, 1180, "", 1, 0 -etbFeedForward = scalar, F32, 1184 -etbIntegralError = scalar, F32, 1188, "", 1, 0 -etbCurrentTarget = scalar, F32, 1192, "%", 1, 0 -; total TS size = 1196 -faultCode = scalar, U08, 1196, "", 1, 0 -heaterDuty = scalar, U08, 1197, "%", 1, 0 -pumpDuty = scalar, U08, 1198, "%", 1, 0 -tempC = scalar, U16, 1200, "C", 1, 0 -nernstVoltage = scalar, U16, 1202, "V", 0.001, 0 -esr = scalar, U16, 1204, "", 1, 0 -; total TS size = 1208 +wallFuelCorrection = scalar, F32, 1116, "", 1, 0 +wallFuel = scalar, F32, 1120, "", 1, 0 +; total TS size = 1124 +idleState = bits, S32, 1124, [0:2], "not important" +currentIdlePosition = scalar, F32, 1128 +baseIdlePosition = scalar, F32, 1132 +iacByTpsTaper = scalar, F32, 1136 +throttlePedalUpState = scalar, S32, 1140, "", 1, 0 +mightResetPid = bits, U32, 1144, [0:0] +shouldResetPid = bits, U32, 1144, [1:1] +wasResetPid = bits, U32, 1144, [2:2] +mustResetPid = bits, U32, 1144, [3:3] +isCoasting = bits, U32, 1144, [4:4] +useIacTableForCoasting = bits, U32, 1144, [5:5] +notIdling = bits, U32, 1144, [6:6] +needReset = bits, U32, 1144, [7:7] +isInDeadZone = bits, U32, 1144, [8:8] +isBlipping = bits, U32, 1144, [9:9] +useClosedLoop = bits, U32, 1144, [10:10] +badTps = bits, U32, 1144, [11:11] +looksLikeRunning = bits, U32, 1144, [12:12] +looksLikeCoasting = bits, U32, 1144, [13:13] +looksLikeCrankToIdle = bits, U32, 1144, [14:14] +useInstantRpmForIdle = bits, U32, 1144, [15:15] +isVerboseIAC = bits, U32, 1144, [16:16] +unusedBit_22_17 = bits, U32, 1144, [17:17] +unusedBit_22_18 = bits, U32, 1144, [18:18] +unusedBit_22_19 = bits, U32, 1144, [19:19] +unusedBit_22_20 = bits, U32, 1144, [20:20] +unusedBit_22_21 = bits, U32, 1144, [21:21] +unusedBit_22_22 = bits, U32, 1144, [22:22] +unusedBit_22_23 = bits, U32, 1144, [23:23] +unusedBit_22_24 = bits, U32, 1144, [24:24] +unusedBit_22_25 = bits, U32, 1144, [25:25] +unusedBit_22_26 = bits, U32, 1144, [26:26] +unusedBit_22_27 = bits, U32, 1144, [27:27] +unusedBit_22_28 = bits, U32, 1144, [28:28] +unusedBit_22_29 = bits, U32, 1144, [29:29] +unusedBit_22_30 = bits, U32, 1144, [30:30] +unusedBit_22_31 = bits, U32, 1144, [31:31] +targetRpmByClt = scalar, S32, 1148, "", 1, 0 +targetRpmAcBump = scalar, S32, 1152, "", 1, 0 +iacByRpmTaper = scalar, F32, 1156 +luaAdd = scalar, F32, 1160 +; total TS size = 1164 +baseDwell = scalar, F32, 1164, "", 1, 0 +dwellVoltageCorrection = scalar, F32, 1168, "", 1, 0 +luaTimingAdd = scalar, F32, 1172, "", 1, 0 +luaTimingMult = scalar, F32, 1176, "", 1, 0 +; total TS size = 1180 +idlePosition = scalar, F32, 1180, "", 1, 0 +trim = scalar, F32, 1184, "", 1, 0 +luaAdjustment = scalar, F32, 1188, "", 1, 0 +etbFeedForward = scalar, F32, 1192 +etbIntegralError = scalar, F32, 1196, "", 1, 0 +etbCurrentTarget = scalar, F32, 1200, "%", 1, 0 +; total TS size = 1204 +faultCode = scalar, U08, 1204, "", 1, 0 +heaterDuty = scalar, U08, 1205, "%", 1, 0 +pumpDuty = scalar, U08, 1206, "%", 1, 0 +tempC = scalar, U16, 1208, "C", 1, 0 +nernstVoltage = scalar, U16, 1210, "V", 0.001, 0 +esr = scalar, U16, 1212, "", 1, 0 +; total TS size = 1216 time = { timeNow } @@ -4723,6 +4725,8 @@ entry = hellenBoardId, "Detected Board ID", int, "%d" entry = clutchUpState, "clutch: up", int, "%d" entry = clutchDownState, "clutch: down", int, "%d" entry = brakePedalState, "brake: down", int, "%d" +entry = egt1, "egt1", float, "%.3f" +entry = egt2, "egt2", float, "%.3f" entry = tpsFrom, "tpsFrom", float, "%.3f" entry = tpsTo, "tpsTo", float, "%.3f" entry = deltaTps, "deltaTps", float, "%.3f" @@ -5462,6 +5466,8 @@ dialog = engine_stateDialog, "engine_state" liveGraph = engine_state_9_Graph, "Graph", South graphLine = timingPidCorrection graphLine = hellenBoardId + graphLine = egt1 + graphLine = egt2 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 4548742c0c..b303fc18d5 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 Wed Aug 17 03:00:17 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Aug 22 15:18:36 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -523,6 +523,8 @@ public class EngineState { public static final Field UNUSEDBIT_22_29 = Field.create("UNUSEDBIT_22_29", 136, FieldType.BIT, 29); public static final Field UNUSEDBIT_22_30 = Field.create("UNUSEDBIT_22_30", 136, FieldType.BIT, 30); public static final Field UNUSEDBIT_22_31 = Field.create("UNUSEDBIT_22_31", 136, FieldType.BIT, 31); + public static final Field EGT1 = Field.create("EGT1", 140, FieldType.FLOAT); + public static final Field EGT2 = Field.create("EGT2", 144, FieldType.FLOAT); public static final Field[] VALUES = { LUA_FUELADD, LUA_FUELMULT, @@ -654,5 +656,7 @@ public class EngineState { UNUSEDBIT_22_29, UNUSEDBIT_22_30, UNUSEDBIT_22_31, + EGT1, + EGT2, }; } 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 e57070cfb8..1d0f1f006c 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 Mon Aug 22 01:57:43 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Aug 22 15:19:46 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1889,6 +1889,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; + public static final int SIGNATURE_HASH = 1992782882; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2378,10 +2379,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.08.22.all.2288281700"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.22.all.1992782882"; 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 = 1208; + public static final int TS_TOTAL_OUTPUT_SIZE = 1216; public static final int TsCalMode_EtbKd = 5; public static final int TsCalMode_EtbKi = 4; public static final int TsCalMode_EtbKp = 3;