From f2cad9076cb79f02f58988727ad178e6eb771e4a Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Tue, 20 Sep 2022 02:05:56 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../console/binary/generated/data_logs.ini | 2 - firmware/console/binary/generated/gauges.ini | 12 +-- .../binary/generated/output_channels.ini | 62 +++++++-------- .../binary/output_channels_generated.h | 72 ++++++++--------- .../controllers/generated/rusefi_generated.h | 4 +- .../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 +- .../lua/generated/output_lookup_generated.cpp | 4 - firmware/tunerstudio/generated/rusefi.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_48way.ini | 77 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 77 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_cypress.ini | 77 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 77 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 77 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 77 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 77 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 77 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 77 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 77 +++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 77 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 77 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 77 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 77 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 77 +++++++++---------- firmware/tunerstudio/generated/rusefi_kin.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 77 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 77 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 77 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 77 +++++++++---------- .../generated/rusefi_proteus_f7.ini | 77 +++++++++---------- .../generated/rusefi_proteus_h7.ini | 77 +++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 77 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 77 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 4 +- .../rusefi/config/generated/TsOutputs.java | 76 +++++++++--------- 75 files changed, 1401 insertions(+), 1439 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 9188b37e63..bfe8cd5d55 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3633963802 +#define SIGNATURE_HASH 2645782274 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,7 +2525,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.20.cypress.3633963802" +#define TS_SIGNATURE "rusEFI 2022.09.20.cypress.2645782274" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 415bdf4e05..19003ac819 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2957918678 +#define SIGNATURE_HASH 4117024206 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,7 +2525,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.20.kin.2957918678" +#define TS_SIGNATURE "rusEFI 2022.09.20.kin.4117024206" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' 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 e002d857bd..2315639ff3 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 @@ -1933,7 +1933,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2709994176 +#define SIGNATURE_HASH 3836589784 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2492,7 +2492,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.20.subaru_eg33_f7.2709994176" +#define TS_SIGNATURE "rusEFI 2022.09.20.subaru_eg33_f7.3836589784" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 54dd3a2a34..a7d030133e 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -1,6 +1,4 @@ entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 816d7dab19..ba894623e4 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -1,6 +1,4 @@ sd_presentGauge = sd_present,"sd_present", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -isIgnitionEnabledIndicatorGauge = isIgnitionEnabledIndicator,"isIgnitionEnabledIndicator", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -isInjectionEnabledIndicatorGauge = isInjectionEnabledIndicator,"isInjectionEnabledIndicator", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 sd_logging_internalGauge = sd_logging_internal,"sd_logging_internal", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 unusedb4Gauge = unusedb4,"unusedb4", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 unusedb5Gauge = unusedb5,"unusedb5", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 @@ -26,10 +24,12 @@ isKnockChipOkGauge = isKnockChipOk,"isKnockChipOk", "", -1.0,-1.0, -1.0,-1.0, -1 launchTriggeredGauge = launchTriggered,"launchTriggered", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isTps2ErrorGauge = isTps2Error,"isTps2Error", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isIdleClosedLoopGauge = isIdleClosedLoop,"isIdleClosedLoop", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_28_28Gauge = unusedBit_28_28,"unusedBit_28_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_28_29Gauge = unusedBit_28_29,"unusedBit_28_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_28_30Gauge = unusedBit_28_30,"unusedBit_28_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -unusedBit_28_31Gauge = unusedBit_28_31,"unusedBit_28_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_26Gauge = unusedBit_26_26,"unusedBit_26_26", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_27Gauge = unusedBit_26_27,"unusedBit_26_27", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_28Gauge = unusedBit_26_28,"unusedBit_26_28", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_29Gauge = unusedBit_26_29,"unusedBit_26_29", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_30Gauge = unusedBit_26_30,"unusedBit_26_30", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 +unusedBit_26_31Gauge = unusedBit_26_31,"unusedBit_26_31", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 RPMValueGauge = RPMValue,"RPM", "RPM", 0.0,8000.0, 0.0,8000.0, 0.0,8000.0, 0,0 rpmAccelerationGauge = rpmAcceleration,"dRPM", "RPM/s", 0.0,5.0, 0.0,5.0, 0.0,5.0, 0,0 speedToRpmRatioGauge = speedToRpmRatio,"Gearbox Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index c52e81253b..0bbe383e0a 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -1,35 +1,35 @@ sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 844875706b..3d306e1e5a 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Sep 17 00:15:40 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Sep 20 02:04:53 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -39,98 +39,98 @@ struct output_channels_s { bool sd_present : 1 {}; /** offset 0 bit 1 */ - bool isIgnitionEnabledIndicator : 1 {}; - /** - offset 0 bit 2 */ - bool isInjectionEnabledIndicator : 1 {}; - /** - offset 0 bit 3 */ bool sd_logging_internal : 1 {}; /** - offset 0 bit 4 */ + offset 0 bit 2 */ bool unusedb4 : 1 {}; /** - offset 0 bit 5 */ + offset 0 bit 3 */ bool unusedb5 : 1 {}; /** * radiator fan - offset 0 bit 6 */ + offset 0 bit 4 */ bool isFanOn : 1 {}; /** - offset 0 bit 7 */ + offset 0 bit 5 */ bool isO2HeaterOn : 1 {}; /** - offset 0 bit 8 */ + offset 0 bit 6 */ bool checkEngine : 1 {}; /** - offset 0 bit 9 */ + offset 0 bit 7 */ bool needBurn : 1 {}; /** - offset 0 bit 10 */ + offset 0 bit 8 */ bool sd_msd : 1 {}; /** - offset 0 bit 11 */ + offset 0 bit 9 */ bool isFan2On : 1 {}; /** - offset 0 bit 12 */ + offset 0 bit 10 */ bool unusedBitLAtwfs : 1 {}; /** - offset 0 bit 13 */ + offset 0 bit 11 */ bool toothLogReady : 1 {}; /** - offset 0 bit 14 */ + offset 0 bit 12 */ bool unused3123 : 1 {}; /** - offset 0 bit 15 */ + offset 0 bit 13 */ bool isTpsError : 1 {}; /** - offset 0 bit 16 */ + offset 0 bit 14 */ bool isCltError : 1 {}; /** - offset 0 bit 17 */ + offset 0 bit 15 */ bool isMapError : 1 {}; /** - offset 0 bit 18 */ + offset 0 bit 16 */ bool isIatError : 1 {}; /** - offset 0 bit 19 */ + offset 0 bit 17 */ bool unused131313 : 1 {}; /** - offset 0 bit 20 */ + offset 0 bit 18 */ bool isTriggerError : 1 {}; /** - offset 0 bit 21 */ + offset 0 bit 19 */ bool hasCriticalError : 1 {}; /** - offset 0 bit 22 */ + offset 0 bit 20 */ bool isWarnNow : 1 {}; /** - offset 0 bit 23 */ + offset 0 bit 21 */ bool isPedalError : 1 {}; /** - offset 0 bit 24 */ + offset 0 bit 22 */ bool isKnockChipOk : 1 {}; /** - offset 0 bit 25 */ + offset 0 bit 23 */ bool launchTriggered : 1 {}; /** - offset 0 bit 26 */ + offset 0 bit 24 */ bool isTps2Error : 1 {}; /** - offset 0 bit 27 */ + offset 0 bit 25 */ bool isIdleClosedLoop : 1 {}; /** + offset 0 bit 26 */ + bool unusedBit_26_26 : 1 {}; + /** + offset 0 bit 27 */ + bool unusedBit_26_27 : 1 {}; + /** offset 0 bit 28 */ - bool unusedBit_28_28 : 1 {}; + bool unusedBit_26_28 : 1 {}; /** offset 0 bit 29 */ - bool unusedBit_28_29 : 1 {}; + bool unusedBit_26_29 : 1 {}; /** offset 0 bit 30 */ - bool unusedBit_28_30 : 1 {}; + bool unusedBit_26_30 : 1 {}; /** offset 0 bit 31 */ - bool unusedBit_28_31 : 1 {}; + bool unusedBit_26_31 : 1 {}; /** * @@GAUGE_NAME_RPM@@ RPM @@ -1416,4 +1416,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 756); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Sep 17 00:15:40 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Sep 20 02:04:53 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 7a85e819d3..0cc6074404 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1967,7 +1967,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3633963802 +#define SIGNATURE_HASH 2645782274 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2525,7 +2525,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.09.20.all.3633963802" +#define TS_SIGNATURE "rusEFI 2022.09.20.all.2645782274" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 88c30bfae3..8365d814e6 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 3485395797 -#define TS_SIGNATURE "rusEFI 2022.09.20.48way.3485395797" +#define SIGNATURE_HASH 2324981581 +#define TS_SIGNATURE "rusEFI 2022.09.20.48way.2324981581" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 30aecda745..b20e620e97 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 3633963802 -#define TS_SIGNATURE "rusEFI 2022.09.20.all.3633963802" +#define SIGNATURE_HASH 2645782274 +#define TS_SIGNATURE "rusEFI 2022.09.20.all.2645782274" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 72ba6f90b0..6c9a6b85d9 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 3935010422 -#define TS_SIGNATURE "rusEFI 2022.09.20.alphax-2chan.3935010422" +#define SIGNATURE_HASH 2946626158 +#define TS_SIGNATURE "rusEFI 2022.09.20.alphax-2chan.2946626158" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index a5ce912f58..2d2f4a7450 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 1401233557 -#define TS_SIGNATURE "rusEFI 2022.09.20.alphax-4chan.1401233557" +#define SIGNATURE_HASH 380611725 +#define TS_SIGNATURE "rusEFI 2022.09.20.alphax-4chan.380611725" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 58162b8b5d..44edd920f9 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 3293779517 -#define TS_SIGNATURE "rusEFI 2022.09.20.atlas.3293779517" +#define SIGNATURE_HASH 2172230181 +#define TS_SIGNATURE "rusEFI 2022.09.20.atlas.2172230181" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index d8485aa0d4..5dd065e7f4 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 779465443 -#define TS_SIGNATURE "rusEFI 2022.09.20.core8.779465443" +#define SIGNATURE_HASH 1801404155 +#define TS_SIGNATURE "rusEFI 2022.09.20.core8.1801404155" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 6b5917f554..28f19a30f9 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 3633963802 -#define TS_SIGNATURE "rusEFI 2022.09.20.cypress.3633963802" +#define SIGNATURE_HASH 2645782274 +#define TS_SIGNATURE "rusEFI 2022.09.20.cypress.2645782274" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 0dff121260..095f80045c 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 3633963802 -#define TS_SIGNATURE "rusEFI 2022.09.20.f407-discovery.3633963802" +#define SIGNATURE_HASH 2645782274 +#define TS_SIGNATURE "rusEFI 2022.09.20.f407-discovery.2645782274" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index e6919fb24f..5bb067b0a1 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 3633963802 -#define TS_SIGNATURE "rusEFI 2022.09.20.f429-discovery.3633963802" +#define SIGNATURE_HASH 2645782274 +#define TS_SIGNATURE "rusEFI 2022.09.20.f429-discovery.2645782274" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index a7fe85daac..b8a495aa77 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 2599755742 -#define TS_SIGNATURE "rusEFI 2022.09.20.frankenso_na6.2599755742" +#define SIGNATURE_HASH 3755971526 +#define TS_SIGNATURE "rusEFI 2022.09.20.frankenso_na6.3755971526" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 003fe40adb..7fd910ad7f 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 677701173 -#define TS_SIGNATURE "rusEFI 2022.09.20.harley81.677701173" +#define SIGNATURE_HASH 1833855533 +#define TS_SIGNATURE "rusEFI 2022.09.20.harley81.1833855533" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 00409cd1bd..e8588263fb 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 1828611756 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen-gm-e67.1828611756" +#define SIGNATURE_HASH 701819572 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen-gm-e67.701819572" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 8c30c5771b..f427d9b98c 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 18010838 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen-nb1.18010838" +#define SIGNATURE_HASH 1144544974 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen-nb1.1144544974" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 634b2a22e1..1327cd75ea 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 1346853872 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen121nissan.1346853872" +#define SIGNATURE_HASH 359520232 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen121nissan.359520232" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f708ba5959..2f0433a740 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 2830639200 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen121vag.2830639200" +#define SIGNATURE_HASH 3985812600 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen121vag.3985812600" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 0f26021002..d30235a2ac 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 644341284 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen128.644341284" +#define SIGNATURE_HASH 1666011708 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen128.1666011708" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a4300caee6..a1c08a351b 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 1087803806 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen154hyundai.1087803806" +#define SIGNATURE_HASH 100408710 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen154hyundai.100408710" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index c72b0120ad..d514515ccb 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 715573790 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen72.715573790" +#define SIGNATURE_HASH 1871463942 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen72.1871463942" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 06e8b55c54..4fc12c98ad 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 4197202704 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen81.4197202704" +#define SIGNATURE_HASH 3204888328 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen81.3204888328" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 18a1d49ad9..17a289219f 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 3446468822 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellen88bmw.3446468822" +#define SIGNATURE_HASH 2286320846 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellen88bmw.2286320846" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index dc77c21792..15ce003df0 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 2262127149 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellenNA6.2262127149" +#define SIGNATURE_HASH 3288325685 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellenNA6.3288325685" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 9f9ecec116..b53b137622 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 2022724338 -#define TS_SIGNATURE "rusEFI 2022.09.20.hellenNA8_96.2022724338" +#define SIGNATURE_HASH 1035656938 +#define TS_SIGNATURE "rusEFI 2022.09.20.hellenNA8_96.1035656938" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 00f76b9b02..a7b8b6c6ae 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 2957918678 -#define TS_SIGNATURE "rusEFI 2022.09.20.kin.2957918678" +#define SIGNATURE_HASH 4117024206 +#define TS_SIGNATURE "rusEFI 2022.09.20.kin.4117024206" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 31ead42347..c07e9f704f 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 391081964 -#define TS_SIGNATURE "rusEFI 2022.09.20.mre_f4.391081964" +#define SIGNATURE_HASH 1382409204 +#define TS_SIGNATURE "rusEFI 2022.09.20.mre_f4.1382409204" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 860615c87e..79b517c3bf 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 391081964 -#define TS_SIGNATURE "rusEFI 2022.09.20.mre_f7.391081964" +#define SIGNATURE_HASH 1382409204 +#define TS_SIGNATURE "rusEFI 2022.09.20.mre_f7.1382409204" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b7dd2b6b12..08e96c0f4f 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 2289253116 -#define TS_SIGNATURE "rusEFI 2022.09.20.prometheus_405.2289253116" +#define SIGNATURE_HASH 3445208804 +#define TS_SIGNATURE "rusEFI 2022.09.20.prometheus_405.3445208804" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index c30a9fde1c..fa2a0d65f3 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 2289253116 -#define TS_SIGNATURE "rusEFI 2022.09.20.prometheus_469.2289253116" +#define SIGNATURE_HASH 3445208804 +#define TS_SIGNATURE "rusEFI 2022.09.20.prometheus_469.3445208804" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5b3254676c..a8a18cd600 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 2102666348 -#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_f4.2102666348" +#define SIGNATURE_HASH 947824756 +#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_f4.947824756" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 48a9b463b1..866d18c406 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 2102666348 -#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_f7.2102666348" +#define SIGNATURE_HASH 947824756 +#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_f7.947824756" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 4228fb7e0a..b2acd1562b 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 2102666348 -#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_h7.2102666348" +#define SIGNATURE_HASH 947824756 +#define TS_SIGNATURE "rusEFI 2022.09.20.proteus_h7.947824756" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 25108f09af..d69dddcda7 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 2709994176 -#define TS_SIGNATURE "rusEFI 2022.09.20.subaru_eg33_f7.2709994176" +#define SIGNATURE_HASH 3836589784 +#define TS_SIGNATURE "rusEFI 2022.09.20.subaru_eg33_f7.3836589784" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 33bdd2e9f3..481e9e4e40 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 1922116942 -#define TS_SIGNATURE "rusEFI 2022.09.20.tdg-pdm8.1922116942" +#define SIGNATURE_HASH 935043414 +#define TS_SIGNATURE "rusEFI 2022.09.20.tdg-pdm8.935043414" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 9684501c83..6bf6bb5c3b 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -3,10 +3,6 @@ float getOutputValueByName(const char *name) { if (strEqualCaseInsensitive(name, "sd_present")) return engine->outputChannels.sd_present; - if (strEqualCaseInsensitive(name, "isIgnitionEnabledIndicator")) - return engine->outputChannels.isIgnitionEnabledIndicator; - if (strEqualCaseInsensitive(name, "isInjectionEnabledIndicator")) - return engine->outputChannels.isInjectionEnabledIndicator; if (strEqualCaseInsensitive(name, "sd_logging_internal")) return engine->outputChannels.sd_logging_internal; if (strEqualCaseInsensitive(name, "isFanOn")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index b8598f98b7..7791ad6537 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.09.20.all.3633963802" + signature = "rusEFI 2022.09.20.all.2645782274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.all.3633963802" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.all.2645782274" ; 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 Sep 19 23:01:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:43 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 63ce069ab5..c29ee9b2d2 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.09.20.48way.3485395797" + signature = "rusEFI 2022.09.20.48way.2324981581" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.48way.3485395797" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.48way.2324981581" ; 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 Sep 19 23:01:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:26 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index f31549b1bf..71507f958f 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.09.20.alphax-2chan.3935010422" + signature = "rusEFI 2022.09.20.alphax-2chan.2946626158" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.alphax-2chan.3935010422" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.alphax-2chan.2946626158" ; 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 Sep 19 23:01:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:04:59 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index bcfcbca206..a177909a21 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.09.20.alphax-4chan.1401233557" + signature = "rusEFI 2022.09.20.alphax-4chan.380611725" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.alphax-4chan.1401233557" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.alphax-4chan.380611725" ; 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 Sep 19 23:01:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:01 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index c9daf91b47..ac694c7e1e 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.09.20.atlas.3293779517" + signature = "rusEFI 2022.09.20.atlas.2172230181" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.atlas.3293779517" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.atlas.2172230181" ; 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 Sep 19 23:01:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:40 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 64ce3c83cd..7db1a7a2ad 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.09.20.core8.779465443" + signature = "rusEFI 2022.09.20.core8.1801404155" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.core8.779465443" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.core8.1801404155" ; 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 Sep 19 23:01:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:25 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index a08ca603cb..6cffa7a3cb 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.09.20.cypress.3633963802" + signature = "rusEFI 2022.09.20.cypress.2645782274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.cypress.3633963802" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.cypress.2645782274" ; 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 Sep 19 23:01:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Tue Sep 20 02:04:56 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 6165610c74..ddf55a1385 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.09.20.f407-discovery.3633963802" + signature = "rusEFI 2022.09.20.f407-discovery.2645782274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.f407-discovery.3633963802" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.f407-discovery.2645782274" ; 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 Sep 19 23:01:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:37 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 34248de3a0..0a421d0ee0 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.09.20.f429-discovery.3633963802" + signature = "rusEFI 2022.09.20.f429-discovery.2645782274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.f429-discovery.3633963802" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.f429-discovery.2645782274" ; 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 Sep 19 23:01:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:39 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a354270344..6a6a19b014 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.09.20.frankenso_na6.2599755742" + signature = "rusEFI 2022.09.20.frankenso_na6.3755971526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.frankenso_na6.2599755742" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.frankenso_na6.3755971526" ; 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 Sep 19 23:01:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:28 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index b1df2c6a89..0b6ffbb43d 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.09.20.harley81.677701173" + signature = "rusEFI 2022.09.20.harley81.1833855533" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.harley81.677701173" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.harley81.1833855533" ; 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 Sep 19 23:01:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:02 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 1ea136dc1e..e873a2b1fa 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.09.20.hellen-gm-e67.1828611756" + signature = "rusEFI 2022.09.20.hellen-gm-e67.701819572" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen-gm-e67.1828611756" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen-gm-e67.701819572" ; 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 Sep 19 23:01:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:17 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 9e7eb3ce3d..eaed6746ac 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.09.20.hellen-nb1.18010838" + signature = "rusEFI 2022.09.20.hellen-nb1.1144544974" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen-nb1.18010838" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen-nb1.1144544974" ; 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 Sep 19 23:01:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:15 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index afeb78db9a..58be8ebc98 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.09.20.hellen121nissan.1346853872" + signature = "rusEFI 2022.09.20.hellen121nissan.359520232" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen121nissan.1346853872" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen121nissan.359520232" ; 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 Sep 19 23:01:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:07 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index e14141bfe9..4516010b24 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.09.20.hellen121vag.2830639200" + signature = "rusEFI 2022.09.20.hellen121vag.3985812600" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen121vag.2830639200" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen121vag.3985812600" ; 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 Sep 19 23:01:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:05 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index b1d2d39200..a1676ffbf4 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.09.20.hellen128.644341284" + signature = "rusEFI 2022.09.20.hellen128.1666011708" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen128.644341284" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen128.1666011708" ; 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 Sep 19 23:01:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:04 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index e43f9f47b9..5620a82d96 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.09.20.hellen154hyundai.1087803806" + signature = "rusEFI 2022.09.20.hellen154hyundai.100408710" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen154hyundai.1087803806" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen154hyundai.100408710" ; 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 Sep 19 23:01:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:09 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index cb9369751b..0428af1571 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.09.20.hellen72.715573790" + signature = "rusEFI 2022.09.20.hellen72.1871463942" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen72.715573790" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen72.1871463942" ; 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 Sep 19 23:01:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:12 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 78cc8b341f..b754040f2b 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.09.20.hellen81.4197202704" + signature = "rusEFI 2022.09.20.hellen81.3204888328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen81.4197202704" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen81.3204888328" ; 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 Sep 19 23:01:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:13 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index a2f5aae593..cb6dabc599 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.09.20.hellen88bmw.3446468822" + signature = "rusEFI 2022.09.20.hellen88bmw.2286320846" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellen88bmw.3446468822" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellen88bmw.2286320846" ; 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 Sep 19 23:01:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:10 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 35e29c1e98..7d81a01567 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.09.20.hellenNA6.2262127149" + signature = "rusEFI 2022.09.20.hellenNA6.3288325685" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellenNA6.2262127149" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellenNA6.3288325685" ; 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 Sep 19 23:01:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:18 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index a7fdc32274..ed71b4995d 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.09.20.hellenNA8_96.2022724338" + signature = "rusEFI 2022.09.20.hellenNA8_96.1035656938" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.hellenNA8_96.2022724338" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.hellenNA8_96.1035656938" ; 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 Sep 19 23:01:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:20 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index ece4bcc586..13c60a7c02 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.09.20.kin.2957918678" + signature = "rusEFI 2022.09.20.kin.4117024206" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.kin.2957918678" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.kin.4117024206" ; 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 Sep 19 23:01:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 20 02:04:54 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index d07516800f..6834598ff7 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.09.20.mre_f4.391081964" + signature = "rusEFI 2022.09.20.mre_f4.1382409204" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.mre_f4.391081964" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.mre_f4.1382409204" ; 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 Sep 19 23:01:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:23 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 640b18edb7..e09651cf3d 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.09.20.mre_f7.391081964" + signature = "rusEFI 2022.09.20.mre_f7.1382409204" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.mre_f7.391081964" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.mre_f7.1382409204" ; 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 Sep 19 23:01:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:21 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 1f89ffbfdc..bd3bc9bfb3 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.09.20.prometheus_405.2289253116" + signature = "rusEFI 2022.09.20.prometheus_405.3445208804" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.prometheus_405.2289253116" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.prometheus_405.3445208804" ; 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 Sep 19 23:01:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:31 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1c969e7957..c25b1908a3 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.09.20.prometheus_469.2289253116" + signature = "rusEFI 2022.09.20.prometheus_469.3445208804" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.prometheus_469.2289253116" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.prometheus_469.3445208804" ; 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 Sep 19 23:01:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:30 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index c3160b48cc..9f5d598168 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.09.20.proteus_f4.2102666348" + signature = "rusEFI 2022.09.20.proteus_f4.947824756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.proteus_f4.2102666348" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.proteus_f4.947824756" ; 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 Sep 19 23:01:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:34 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 54d9973b1d..56b3a9e480 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.09.20.proteus_f7.2102666348" + signature = "rusEFI 2022.09.20.proteus_f7.947824756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.proteus_f7.2102666348" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.proteus_f7.947824756" ; 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 Sep 19 23:01:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:33 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 2a8b72aeaa..708767f659 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.09.20.proteus_h7.2102666348" + signature = "rusEFI 2022.09.20.proteus_h7.947824756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.proteus_h7.2102666348" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.proteus_h7.947824756" ; 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 Sep 19 23:01:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:36 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index a4759fcab7..437d03858a 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.09.20.subaru_eg33_f7.2709994176" + signature = "rusEFI 2022.09.20.subaru_eg33_f7.3836589784" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.subaru_eg33_f7.2709994176" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.subaru_eg33_f7.3836589784" ; 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 Sep 19 23:01:04 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 Tue Sep 20 02:04:57 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index e82c15354a..8bd228437b 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.09.20.tdg-pdm8.1922116942" + signature = "rusEFI 2022.09.20.tdg-pdm8.935043414" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.09.20.tdg-pdm8.1922116942" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.09.20.tdg-pdm8.935043414" ; 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 Sep 19 23:01:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:42 UTC 2022 pageSize = 22048 page = 1 @@ -2147,37 +2147,37 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 ; sd_present = bits, U32, 0, [0:0] -isIgnitionEnabledIndicator = bits, U32, 0, [1:1] -isInjectionEnabledIndicator = bits, U32, 0, [2:2] -sd_logging_internal = bits, U32, 0, [3:3] -unusedb4 = bits, U32, 0, [4:4] -unusedb5 = bits, U32, 0, [5:5] -isFanOn = bits, U32, 0, [6:6] -isO2HeaterOn = bits, U32, 0, [7:7] -checkEngine = bits, U32, 0, [8:8] -needBurn = bits, U32, 0, [9:9] -sd_msd = bits, U32, 0, [10:10] -isFan2On = bits, U32, 0, [11:11] -unusedBitLAtwfs = bits, U32, 0, [12:12] -toothLogReady = bits, U32, 0, [13:13] -unused3123 = bits, U32, 0, [14:14] -isTpsError = bits, U32, 0, [15:15] -isCltError = bits, U32, 0, [16:16] -isMapError = bits, U32, 0, [17:17] -isIatError = bits, U32, 0, [18:18] -unused131313 = bits, U32, 0, [19:19] -isTriggerError = bits, U32, 0, [20:20] -hasCriticalError = bits, U32, 0, [21:21] -isWarnNow = bits, U32, 0, [22:22] -isPedalError = bits, U32, 0, [23:23] -isKnockChipOk = bits, U32, 0, [24:24] -launchTriggered = bits, U32, 0, [25:25] -isTps2Error = bits, U32, 0, [26:26] -isIdleClosedLoop = bits, U32, 0, [27:27] -unusedBit_28_28 = bits, U32, 0, [28:28] -unusedBit_28_29 = bits, U32, 0, [29:29] -unusedBit_28_30 = bits, U32, 0, [30:30] -unusedBit_28_31 = bits, U32, 0, [31:31] +sd_logging_internal = bits, U32, 0, [1:1] +unusedb4 = bits, U32, 0, [2:2] +unusedb5 = bits, U32, 0, [3:3] +isFanOn = bits, U32, 0, [4:4] +isO2HeaterOn = bits, U32, 0, [5:5] +checkEngine = bits, U32, 0, [6:6] +needBurn = bits, U32, 0, [7:7] +sd_msd = bits, U32, 0, [8:8] +isFan2On = bits, U32, 0, [9:9] +unusedBitLAtwfs = bits, U32, 0, [10:10] +toothLogReady = bits, U32, 0, [11:11] +unused3123 = bits, U32, 0, [12:12] +isTpsError = bits, U32, 0, [13:13] +isCltError = bits, U32, 0, [14:14] +isMapError = bits, U32, 0, [15:15] +isIatError = bits, U32, 0, [16:16] +unused131313 = bits, U32, 0, [17:17] +isTriggerError = bits, U32, 0, [18:18] +hasCriticalError = bits, U32, 0, [19:19] +isWarnNow = bits, U32, 0, [20:20] +isPedalError = bits, U32, 0, [21:21] +isKnockChipOk = bits, U32, 0, [22:22] +launchTriggered = bits, U32, 0, [23:23] +isTps2Error = bits, U32, 0, [24:24] +isIdleClosedLoop = bits, U32, 0, [25:25] +unusedBit_26_26 = bits, U32, 0, [26:26] +unusedBit_26_27 = bits, U32, 0, [27:27] +unusedBit_26_28 = bits, U32, 0, [28:28] +unusedBit_26_29 = bits, U32, 0, [29:29] +unusedBit_26_30 = bits, U32, 0, [30:30] +unusedBit_26_31 = bits, U32, 0, [31:31] RPMValue = scalar, U16, 4, "RPM", 1, 0 rpmAcceleration = scalar, U16, 6, "RPM/s", 1, 0 speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 @@ -3333,6 +3333,8 @@ esr = scalar, U16, 1256, "", 1, 0 wboFaultCodeList = bits, U08, [0:3], "OK", "Unk", "Unk", "failed to heat", "overheat", "underheat", "no supply" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart" + [ConstantsExtensions] ; defaultValue is used to provide TunerStudio with a value to use in the case of ; the constant not yet being initialized. This is primarily important if the @@ -4499,8 +4501,8 @@ gaugeCategory = GPPWM Outputs indicator = { isWarnNow }, "No warnings", "Warning", white, black, yellow, black indicator = { checkEngine }, "No Check Engine", "Check Engine", white, black, red, black indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black - indicator = { isIgnitionEnabledIndicator }, "Ignition cut", "Ignition OK", yellow, black, white, black - indicator = { isInjectionEnabledIndicator }, "Injection cut", "Injection OK", yellow, black, white, black + indicator = { fuelCutReason != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black + indicator = { sparkCutReason != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black ; this is required so that the "config error" feature works in TS ; DO NOT CHANGE THIS LINE - TS is looking for an indicator with particular text/styling @@ -4515,7 +4517,6 @@ gaugeCategory = GPPWM Outputs indicator = { isFanOn }, "Fan off", "Fan on", white, black, green, black indicator = { isFan2On }, "Fan 2 off", "Fan 2 on", white, black, green, black indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black - indicator = { fuelCutReason == 11 }, "No cleanup", "Cyl cleanup", white, black, yellow, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -4560,8 +4561,6 @@ gaugeCategory = GPPWM Outputs ; Channel Label Type Format entry = time, "Time", float, "%.3f" entry = sd_present, "sd_present", int, "%d" -entry = isIgnitionEnabledIndicator, "isIgnitionEnabledIndicator", int, "%d" -entry = isInjectionEnabledIndicator, "isInjectionEnabledIndicator", int, "%d" entry = sd_logging_internal, "sd_logging_internal", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" 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 9a5375cd87..a27fe349f6 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 Sep 19 23:01:53 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 20 02:05:46 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2408,7 +2408,7 @@ 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.09.20.all.3633963802"; + public static final String TS_SIGNATURE = "rusEFI 2022.09.20.all.2645782274"; 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 = 1260; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index e1ba0822ff..354e496dba 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Sep 17 00:15:40 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Sep 20 02:04:53 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -388,37 +388,37 @@ public class TsOutputs { public static final int VR_THRESHOLD_COUNT = 2; public static final int WWAE_TABLE_SIZE = 8; public static final Field SD_PRESENT = Field.create("SD_PRESENT", 0, FieldType.BIT, 0); - public static final Field ISIGNITIONENABLEDINDICATOR = Field.create("ISIGNITIONENABLEDINDICATOR", 0, FieldType.BIT, 1); - public static final Field ISINJECTIONENABLEDINDICATOR = Field.create("ISINJECTIONENABLEDINDICATOR", 0, FieldType.BIT, 2); - public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 3); - public static final Field UNUSEDB4 = Field.create("UNUSEDB4", 0, FieldType.BIT, 4); - public static final Field UNUSEDB5 = Field.create("UNUSEDB5", 0, FieldType.BIT, 5); - public static final Field ISFANON = Field.create("ISFANON", 0, FieldType.BIT, 6); - public static final Field ISO2HEATERON = Field.create("ISO2HEATERON", 0, FieldType.BIT, 7); - public static final Field CHECKENGINE = Field.create("CHECKENGINE", 0, FieldType.BIT, 8); - public static final Field NEEDBURN = Field.create("NEEDBURN", 0, FieldType.BIT, 9); - public static final Field SD_MSD = Field.create("SD_MSD", 0, FieldType.BIT, 10); - public static final Field ISFAN2ON = Field.create("ISFAN2ON", 0, FieldType.BIT, 11); - public static final Field UNUSEDBITLATWFS = Field.create("UNUSEDBITLATWFS", 0, FieldType.BIT, 12); - public static final Field TOOTHLOGREADY = Field.create("TOOTHLOGREADY", 0, FieldType.BIT, 13); - public static final Field UNUSED3123 = Field.create("UNUSED3123", 0, FieldType.BIT, 14); - public static final Field ISTPSERROR = Field.create("ISTPSERROR", 0, FieldType.BIT, 15); - public static final Field ISCLTERROR = Field.create("ISCLTERROR", 0, FieldType.BIT, 16); - public static final Field ISMAPERROR = Field.create("ISMAPERROR", 0, FieldType.BIT, 17); - public static final Field ISIATERROR = Field.create("ISIATERROR", 0, FieldType.BIT, 18); - public static final Field UNUSED131313 = Field.create("UNUSED131313", 0, FieldType.BIT, 19); - public static final Field ISTRIGGERERROR = Field.create("ISTRIGGERERROR", 0, FieldType.BIT, 20); - public static final Field HASCRITICALERROR = Field.create("HASCRITICALERROR", 0, FieldType.BIT, 21); - public static final Field ISWARNNOW = Field.create("ISWARNNOW", 0, FieldType.BIT, 22); - public static final Field ISPEDALERROR = Field.create("ISPEDALERROR", 0, FieldType.BIT, 23); - public static final Field ISKNOCKCHIPOK = Field.create("ISKNOCKCHIPOK", 0, FieldType.BIT, 24); - public static final Field LAUNCHTRIGGERED = Field.create("LAUNCHTRIGGERED", 0, FieldType.BIT, 25); - public static final Field ISTPS2ERROR = Field.create("ISTPS2ERROR", 0, FieldType.BIT, 26); - public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 0, FieldType.BIT, 27); - public static final Field UNUSEDBIT_28_28 = Field.create("UNUSEDBIT_28_28", 0, FieldType.BIT, 28); - public static final Field UNUSEDBIT_28_29 = Field.create("UNUSEDBIT_28_29", 0, FieldType.BIT, 29); - public static final Field UNUSEDBIT_28_30 = Field.create("UNUSEDBIT_28_30", 0, FieldType.BIT, 30); - public static final Field UNUSEDBIT_28_31 = Field.create("UNUSEDBIT_28_31", 0, FieldType.BIT, 31); + public static final Field SD_LOGGING_INTERNAL = Field.create("SD_LOGGING_INTERNAL", 0, FieldType.BIT, 1); + public static final Field UNUSEDB4 = Field.create("UNUSEDB4", 0, FieldType.BIT, 2); + public static final Field UNUSEDB5 = Field.create("UNUSEDB5", 0, FieldType.BIT, 3); + public static final Field ISFANON = Field.create("ISFANON", 0, FieldType.BIT, 4); + public static final Field ISO2HEATERON = Field.create("ISO2HEATERON", 0, FieldType.BIT, 5); + public static final Field CHECKENGINE = Field.create("CHECKENGINE", 0, FieldType.BIT, 6); + public static final Field NEEDBURN = Field.create("NEEDBURN", 0, FieldType.BIT, 7); + public static final Field SD_MSD = Field.create("SD_MSD", 0, FieldType.BIT, 8); + public static final Field ISFAN2ON = Field.create("ISFAN2ON", 0, FieldType.BIT, 9); + public static final Field UNUSEDBITLATWFS = Field.create("UNUSEDBITLATWFS", 0, FieldType.BIT, 10); + public static final Field TOOTHLOGREADY = Field.create("TOOTHLOGREADY", 0, FieldType.BIT, 11); + public static final Field UNUSED3123 = Field.create("UNUSED3123", 0, FieldType.BIT, 12); + public static final Field ISTPSERROR = Field.create("ISTPSERROR", 0, FieldType.BIT, 13); + public static final Field ISCLTERROR = Field.create("ISCLTERROR", 0, FieldType.BIT, 14); + public static final Field ISMAPERROR = Field.create("ISMAPERROR", 0, FieldType.BIT, 15); + public static final Field ISIATERROR = Field.create("ISIATERROR", 0, FieldType.BIT, 16); + public static final Field UNUSED131313 = Field.create("UNUSED131313", 0, FieldType.BIT, 17); + public static final Field ISTRIGGERERROR = Field.create("ISTRIGGERERROR", 0, FieldType.BIT, 18); + public static final Field HASCRITICALERROR = Field.create("HASCRITICALERROR", 0, FieldType.BIT, 19); + public static final Field ISWARNNOW = Field.create("ISWARNNOW", 0, FieldType.BIT, 20); + public static final Field ISPEDALERROR = Field.create("ISPEDALERROR", 0, FieldType.BIT, 21); + public static final Field ISKNOCKCHIPOK = Field.create("ISKNOCKCHIPOK", 0, FieldType.BIT, 22); + public static final Field LAUNCHTRIGGERED = Field.create("LAUNCHTRIGGERED", 0, FieldType.BIT, 23); + public static final Field ISTPS2ERROR = Field.create("ISTPS2ERROR", 0, FieldType.BIT, 24); + public static final Field ISIDLECLOSEDLOOP = Field.create("ISIDLECLOSEDLOOP", 0, FieldType.BIT, 25); + public static final Field UNUSEDBIT_26_26 = Field.create("UNUSEDBIT_26_26", 0, FieldType.BIT, 26); + public static final Field UNUSEDBIT_26_27 = Field.create("UNUSEDBIT_26_27", 0, FieldType.BIT, 27); + public static final Field UNUSEDBIT_26_28 = Field.create("UNUSEDBIT_26_28", 0, FieldType.BIT, 28); + public static final Field UNUSEDBIT_26_29 = Field.create("UNUSEDBIT_26_29", 0, FieldType.BIT, 29); + public static final Field UNUSEDBIT_26_30 = Field.create("UNUSEDBIT_26_30", 0, FieldType.BIT, 30); + public static final Field UNUSEDBIT_26_31 = Field.create("UNUSEDBIT_26_31", 0, FieldType.BIT, 31); public static final Field RPMVALUE = Field.create("RPMVALUE", 4, FieldType.INT16).setScale(1.0); public static final Field RPMACCELERATION = Field.create("RPMACCELERATION", 6, FieldType.INT16).setScale(1.0); public static final Field SPEEDTORPMRATIO = Field.create("SPEEDTORPMRATIO", 8, FieldType.INT16).setScale(0.01); @@ -941,8 +941,6 @@ public class TsOutputs { public static final Field ALIGNMENTFILL_AT_754 = Field.create("ALIGNMENTFILL_AT_754", 754, FieldType.INT8).setScale(1.0); public static final Field[] VALUES = { SD_PRESENT, - ISIGNITIONENABLEDINDICATOR, - ISINJECTIONENABLEDINDICATOR, SD_LOGGING_INTERNAL, UNUSEDB4, UNUSEDB5, @@ -968,10 +966,12 @@ public class TsOutputs { LAUNCHTRIGGERED, ISTPS2ERROR, ISIDLECLOSEDLOOP, - UNUSEDBIT_28_28, - UNUSEDBIT_28_29, - UNUSEDBIT_28_30, - UNUSEDBIT_28_31, + UNUSEDBIT_26_26, + UNUSEDBIT_26_27, + UNUSEDBIT_26_28, + UNUSEDBIT_26_29, + UNUSEDBIT_26_30, + UNUSEDBIT_26_31, RPMVALUE, RPMACCELERATION, SPEEDTORPMRATIO,