From 8b8ce329b34ade1d823154bae887095cecc13008 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sat, 27 Aug 2022 18:44:44 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../config/controllers/algo/rusefi_generated.h | 4 ++-- .../config/controllers/algo/rusefi_generated.h | 4 ++-- .../config/controllers/algo/rusefi_generated.h | 4 ++-- firmware/console/binary/generated/data_logs.ini | 3 +-- .../console/binary/generated/fancy_content.ini | 2 +- firmware/console/binary/generated/gauges.ini | 2 +- .../console/binary/generated/output_channels.ini | 4 ++-- .../console/binary/output_channels_generated.h | 6 +++--- .../actuators/fuel_pump_control_generated.h | 6 +++--- .../controllers/generated/rusefi_generated.h | 4 ++-- firmware/controllers/generated/signature_48way.h | 4 ++-- firmware/controllers/generated/signature_all.h | 4 ++-- .../generated/signature_alphax-2chan.h | 4 ++-- .../generated/signature_alphax-4chan.h | 4 ++-- firmware/controllers/generated/signature_atlas.h | 4 ++-- firmware/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 ++-- .../controllers/generated/signature_harley81.h | 4 ++-- .../generated/signature_hellen-gm-e67.h | 4 ++-- .../controllers/generated/signature_hellen-nb1.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../controllers/generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen154hyundai.h | 4 ++-- .../controllers/generated/signature_hellen72.h | 4 ++-- .../controllers/generated/signature_hellen81.h | 4 ++-- .../generated/signature_hellen88bmw.h | 4 ++-- .../controllers/generated/signature_hellenNA6.h | 4 ++-- .../generated/signature_hellenNA8_96.h | 4 ++-- firmware/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 ++-- .../controllers/generated/signature_proteus_f4.h | 4 ++-- .../controllers/generated/signature_proteus_f7.h | 4 ++-- .../controllers/generated/signature_proteus_h7.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- .../controllers/generated/signature_tdg-pdm8.h | 4 ++-- .../lua/generated/output_lookup_generated.cpp | 2 -- firmware/tunerstudio/generated/rusefi.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_48way.ini | 16 +++++++--------- .../generated/rusefi_alphax-2chan.ini | 16 +++++++--------- .../generated/rusefi_alphax-4chan.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_atlas.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_core8.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 16 +++++++--------- .../generated/rusefi_f407-discovery.ini | 16 +++++++--------- .../generated/rusefi_f429-discovery.ini | 16 +++++++--------- .../generated/rusefi_frankenso_na6.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 16 +++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_hellen-nb1.ini | 16 +++++++--------- .../generated/rusefi_hellen121nissan.ini | 16 +++++++--------- .../generated/rusefi_hellen121vag.ini | 16 +++++++--------- .../generated/rusefi_hellen128mercedes.ini | 16 +++++++--------- .../generated/rusefi_hellen154hyundai.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_hellen88bmw.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_hellenNA6.ini | 16 +++++++--------- .../generated/rusefi_hellenNA8_96.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_mre_f4.ini | 16 +++++++--------- firmware/tunerstudio/generated/rusefi_mre_f7.ini | 16 +++++++--------- .../generated/rusefi_prometheus_405.ini | 16 +++++++--------- .../generated/rusefi_prometheus_469.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_proteus_f4.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_proteus_f7.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_proteus_h7.ini | 16 +++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 16 +++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 16 +++++++--------- .../java/com/rusefi/config/generated/Fields.java | 5 +++-- .../com/rusefi/config/generated/FuelPump.java | 6 +++--- .../com/rusefi/config/generated/TsOutputs.java | 6 +++--- 78 files changed, 316 insertions(+), 382 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 6cb3f960d4..bd6ac65b15 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1935,7 +1935,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3908256253 +#define SIGNATURE_HASH 2029140192 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2491,7 +2491,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.08.27.cypress.3908256253" +#define TS_SIGNATURE "rusEFI 2022.08.27.cypress.2029140192" #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 6d7e25fd11..9c4f2d025b 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1935,7 +1935,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2149901105 +#define SIGNATURE_HASH 270899756 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2491,7 +2491,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.08.27.kin.2149901105" +#define TS_SIGNATURE "rusEFI 2022.08.27.kin.270899756" #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 f4491c6c02..0bdc602955 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 @@ -1901,7 +1901,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2798581317 +#define SIGNATURE_HASH 919572312 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2458,7 +2458,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.08.27.subaru_eg33_f7.2798581317" +#define TS_SIGNATURE "rusEFI 2022.08.27.subaru_eg33_f7.919572312" #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 a8a6436ccc..cea050b816 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -2,7 +2,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -323,7 +322,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index 7f82de246b..5c3bd1867a 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -92,7 +92,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 4218c42334..691c3f35a0 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -3,7 +3,7 @@ isIgnitionEnabledIndicatorGauge = isIgnitionEnabledIndicator,"isIgnitionEnabledI 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 -isFuelPumpOnGauge = isFuelPumpOn,"isFuelPumpOn", "", -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 isFanOnGauge = isFanOn,"radiator fan", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 isO2HeaterOnGauge = isO2HeaterOn,"isO2HeaterOn", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 checkEngineGauge = checkEngine,"checkEngine", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 72df3c4f96..a196960c29 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -3,7 +3,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -708,7 +708,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index cc1bf62fe9..3f8803bf28 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 Fri Aug 26 00:40:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Aug 27 18:43:19 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -51,7 +51,7 @@ struct output_channels_s { bool unusedb4 : 1 {}; /** offset 0 bit 5 */ - bool isFuelPumpOn : 1 {}; + bool unusedb5 : 1 {}; /** * radiator fan offset 0 bit 6 */ @@ -1318,4 +1318,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 Fri Aug 26 00:40:04 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Aug 27 18:43:19 UTC 2022 diff --git a/firmware/controllers/actuators/fuel_pump_control_generated.h b/firmware/controllers/actuators/fuel_pump_control_generated.h index 3282618aa5..8a46395c80 100644 --- a/firmware/controllers/actuators/fuel_pump_control_generated.h +++ b/firmware/controllers/actuators/fuel_pump_control_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Aug 27 18:43:20 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -13,7 +13,7 @@ struct fuel_pump_control_s { bool engineTurnedRecently : 1 {}; /** offset 0 bit 2 */ - bool isPumpOn : 1 {}; + bool isFuelPumpOn : 1 {}; /** offset 0 bit 3 */ bool ignitionOn : 1 {}; @@ -105,4 +105,4 @@ struct fuel_pump_control_s { static_assert(sizeof(fuel_pump_control_s) == 4); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sun Apr 17 20:27:25 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Aug 27 18:43:20 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 178546ce46..aceb22221b 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1935,7 +1935,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3908256253 +#define SIGNATURE_HASH 2029140192 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2491,7 +2491,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.08.27.all.3908256253" +#define TS_SIGNATURE "rusEFI 2022.08.27.all.2029140192" #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 932df586a3..608f29346f 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 4292102578 -#define TS_SIGNATURE "rusEFI 2022.08.27.48way.4292102578" +#define SIGNATURE_HASH 1876242607 +#define TS_SIGNATURE "rusEFI 2022.08.27.48way.1876242607" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index f83e50ecde..520717aac1 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 3908256253 -#define TS_SIGNATURE "rusEFI 2022.08.27.all.3908256253" +#define SIGNATURE_HASH 2029140192 +#define TS_SIGNATURE "rusEFI 2022.08.27.all.2029140192" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 1c606640cf..69209ad4ea 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 3672235153 -#define TS_SIGNATURE "rusEFI 2022.08.27.alphax-2chan.3672235153" +#define SIGNATURE_HASH 1256236428 +#define TS_SIGNATURE "rusEFI 2022.08.27.alphax-2chan.1256236428" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 411459abe0..6fa635f361 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 1676640882 -#define TS_SIGNATURE "rusEFI 2022.08.27.alphax-4chan.1676640882" +#define SIGNATURE_HASH 4092525423 +#define TS_SIGNATURE "rusEFI 2022.08.27.alphax-4chan.4092525423" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index ce08c0fac4..1ea65a0677 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 4097422554 -#define TS_SIGNATURE "rusEFI 2022.08.27.atlas.4097422554" +#define SIGNATURE_HASH 1681444295 +#define TS_SIGNATURE "rusEFI 2022.08.27.atlas.1681444295" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 86f229ce32..0399224fa0 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 505352196 -#define TS_SIGNATURE "rusEFI 2022.08.27.core8.505352196" +#define SIGNATURE_HASH 2384357657 +#define TS_SIGNATURE "rusEFI 2022.08.27.core8.2384357657" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 34dbc26090..78d73df360 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 3908256253 -#define TS_SIGNATURE "rusEFI 2022.08.27.cypress.3908256253" +#define SIGNATURE_HASH 2029140192 +#define TS_SIGNATURE "rusEFI 2022.08.27.cypress.2029140192" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index e04917a4aa..9f11f35135 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 3908256253 -#define TS_SIGNATURE "rusEFI 2022.08.27.f407-discovery.3908256253" +#define SIGNATURE_HASH 2029140192 +#define TS_SIGNATURE "rusEFI 2022.08.27.f407-discovery.2029140192" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index c37a55a395..2748c158c0 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 3908256253 -#define TS_SIGNATURE "rusEFI 2022.08.27.f429-discovery.3908256253" +#define SIGNATURE_HASH 2029140192 +#define TS_SIGNATURE "rusEFI 2022.08.27.f429-discovery.2029140192" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 67affae122..bf0b1886c9 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 2862595385 -#define TS_SIGNATURE "rusEFI 2022.08.27.frankenso_na6.2862595385" +#define SIGNATURE_HASH 983483428 +#define TS_SIGNATURE "rusEFI 2022.08.27.frankenso_na6.983483428" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index b133cf2fb0..5c174d8054 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 403588306 -#define TS_SIGNATURE "rusEFI 2022.08.27.harley81.403588306" +#define SIGNATURE_HASH 2282700239 +#define TS_SIGNATURE "rusEFI 2022.08.27.harley81.2282700239" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 806a326d4d..ae624d34ce 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 1553253451 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen-gm-e67.1553253451" +#define SIGNATURE_HASH 3432365398 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen-gm-e67.3432365398" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 67469afa27..d467a715d8 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 829976625 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen-nb1.829976625" +#define SIGNATURE_HASH 2709063980 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen-nb1.2709063980" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index cc739ed2b1..62bc3ba818 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 1613625623 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen121nissan.1613625623" +#define SIGNATURE_HASH 4029448202 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen121nissan.4029448202" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4c8f4cbfb8..1f80b801dc 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 2563932807 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen121vag.2563932807" +#define SIGNATURE_HASH 148110234 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen121vag.148110234" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 41ae557e09..9feb5700aa 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 369982659 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen128.369982659" +#define SIGNATURE_HASH 2248934878 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen128.2248934878" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index d173e14b07..2e69506533 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 1891382137 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen154hyundai.1891382137" +#define SIGNATURE_HASH 3770501732 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen154hyundai.3770501732" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index edabeb3231..aef5da694c 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 449603833 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen72.449603833" +#define SIGNATURE_HASH 2328695268 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen72.2328695268" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 576c84d270..1f0b4fa1f9 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 3393624567 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen81.3393624567" +#define SIGNATURE_HASH 1514660074 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen81.1514660074" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 4201af06f8..d568eb2fe0 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 4245049905 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellen88bmw.4245049905" +#define SIGNATURE_HASH 1829186348 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellen88bmw.1829186348" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 1c99d0c0c1..b1368a8792 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 755048319 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellenNA6.755048319" +#define SIGNATURE_HASH 3170920034 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellenNA6.3170920034" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 479dc32e36..c1c7b6c8fe 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 1224405013 -#define TS_SIGNATURE "rusEFI 2022.08.27.hellenNA8_96.1224405013" +#define SIGNATURE_HASH 3640363272 +#define TS_SIGNATURE "rusEFI 2022.08.27.hellenNA8_96.3640363272" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 297c327226..f110847108 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 2149901105 -#define TS_SIGNATURE "rusEFI 2022.08.27.kin.2149901105" +#define SIGNATURE_HASH 270899756 +#define TS_SIGNATURE "rusEFI 2022.08.27.kin.270899756" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 86b4ac0d62..ebe1f969a3 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 656788747 -#define TS_SIGNATURE "rusEFI 2022.08.27.mre_f4.656788747" +#define SIGNATURE_HASH 3072635926 +#define TS_SIGNATURE "rusEFI 2022.08.27.mre_f4.3072635926" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 402b475a30..6c1405a38c 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 656788747 -#define TS_SIGNATURE "rusEFI 2022.08.27.mre_f7.656788747" +#define SIGNATURE_HASH 3072635926 +#define TS_SIGNATURE "rusEFI 2022.08.27.mre_f7.3072635926" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index cd5b5b2768..f9acdcd56b 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 3088685083 -#define TS_SIGNATURE "rusEFI 2022.08.27.prometheus_405.3088685083" +#define SIGNATURE_HASH 672719110 +#define TS_SIGNATURE "rusEFI 2022.08.27.prometheus_405.672719110" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2e71f6a179..3e446d44d6 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 3088685083 -#define TS_SIGNATURE "rusEFI 2022.08.27.prometheus_469.3088685083" +#define SIGNATURE_HASH 672719110 +#define TS_SIGNATURE "rusEFI 2022.08.27.prometheus_469.672719110" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1b4f40d142..8bc631942f 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 1295943307 -#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_f4.1295943307" +#define SIGNATURE_HASH 3711958934 +#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_f4.3711958934" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 5f1ffaed4d..e72d0f4465 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 1295943307 -#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_f7.1295943307" +#define SIGNATURE_HASH 3711958934 +#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_f7.3711958934" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index b3fa86ead2..50f9f5183d 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 1295943307 -#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_h7.1295943307" +#define SIGNATURE_HASH 3711958934 +#define TS_SIGNATURE "rusEFI 2022.08.27.proteus_h7.3711958934" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index d2b5b12165..580c3550c3 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 2798581317 -#define TS_SIGNATURE "rusEFI 2022.08.27.subaru_eg33_f7.2798581317" +#define SIGNATURE_HASH 919572312 +#define TS_SIGNATURE "rusEFI 2022.08.27.subaru_eg33_f7.919572312" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index e42cc47840..de2b65ac0c 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 1123782569 -#define TS_SIGNATURE "rusEFI 2022.08.27.tdg-pdm8.1123782569" +#define SIGNATURE_HASH 3539662516 +#define TS_SIGNATURE "rusEFI 2022.08.27.tdg-pdm8.3539662516" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 8aadbcf661..29a8744fcc 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -9,8 +9,6 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.isInjectionEnabledIndicator; if (strEqualCaseInsensitive(name, "sd_logging_internal")) return engine->outputChannels.sd_logging_internal; - if (strEqualCaseInsensitive(name, "isFuelPumpOn")) - return engine->outputChannels.isFuelPumpOn; if (strEqualCaseInsensitive(name, "isFanOn")) return engine->outputChannels.isFanOn; if (strEqualCaseInsensitive(name, "isO2HeaterOn")) diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 4953964005..e4d5957a16 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.all.3908256253" + signature = "rusEFI 2022.08.27.all.2029140192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.all.3908256253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.all.2029140192" ; 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 Sat Aug 27 14:01:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:27 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 09aeaadb17..0a0bddeb70 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.48way.4292102578" + signature = "rusEFI 2022.08.27.48way.1876242607" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.48way.4292102578" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.48way.1876242607" ; 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 Sat Aug 27 14:00:45 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:04 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5473,7 +5471,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 32c20bbf77..302edd200e 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.alphax-2chan.3672235153" + signature = "rusEFI 2022.08.27.alphax-2chan.1256236428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.alphax-2chan.3672235153" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.alphax-2chan.1256236428" ; 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 Sat Aug 27 14:00:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:27 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5470,7 +5468,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 81e941ab01..4895d800df 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.alphax-4chan.1676640882" + signature = "rusEFI 2022.08.27.alphax-4chan.4092525423" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.alphax-4chan.1676640882" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.alphax-4chan.4092525423" ; 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 Sat Aug 27 14:00:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:30 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 52aab6fde1..3a25cbb882 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.atlas.4097422554" + signature = "rusEFI 2022.08.27.atlas.1681444295" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.atlas.4097422554" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.atlas.1681444295" ; 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 Sat Aug 27 14:01:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:23 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index b8a3bd252e..89678943dd 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.core8.505352196" + signature = "rusEFI 2022.08.27.core8.2384357657" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.core8.505352196" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.core8.2384357657" ; 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 Sat Aug 27 14:00:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:02 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5473,7 +5471,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 9adfdcbe20..b3fb0cf050 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.cypress.3908256253" + signature = "rusEFI 2022.08.27.cypress.2029140192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.cypress.3908256253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.cypress.2029140192" ; 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 Sat Aug 27 14:00:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Aug 27 18:43:23 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index be009944c2..ef03ac5836 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.f407-discovery.3908256253" + signature = "rusEFI 2022.08.27.f407-discovery.2029140192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.f407-discovery.3908256253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.f407-discovery.2029140192" ; 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 Sat Aug 27 14:01:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:19 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 0d64c7f519..2f239426aa 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.f429-discovery.3908256253" + signature = "rusEFI 2022.08.27.f429-discovery.2029140192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.f429-discovery.3908256253" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.f429-discovery.2029140192" ; 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 Sat Aug 27 14:01:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:21 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index f909ba603a..edcc160686 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.frankenso_na6.2862595385" + signature = "rusEFI 2022.08.27.frankenso_na6.983483428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.frankenso_na6.2862595385" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.frankenso_na6.983483428" ; 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 Sat Aug 27 14:00:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:06 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 6984bfe139..9e78be4e4e 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.harley81.403588306" + signature = "rusEFI 2022.08.27.harley81.2282700239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.harley81.403588306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.harley81.2282700239" ; 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 Sat Aug 27 14:00:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:32 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9b4e00cb74..6f8fb32068 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen-gm-e67.1553253451" + signature = "rusEFI 2022.08.27.hellen-gm-e67.3432365398" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen-gm-e67.1553253451" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen-gm-e67.3432365398" ; 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 Sat Aug 27 14:00:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:51 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 8cb1b976c7..27203349c3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen-nb1.829976625" + signature = "rusEFI 2022.08.27.hellen-nb1.2709063980" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen-nb1.829976625" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen-nb1.2709063980" ; 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 Sat Aug 27 14:00:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:49 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 3632262108..ae85b03d8a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen121nissan.1613625623" + signature = "rusEFI 2022.08.27.hellen121nissan.4029448202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen121nissan.1613625623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen121nissan.4029448202" ; 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 Sat Aug 27 14:00:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:38 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index b00320143c..eba687ec9a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen121vag.2563932807" + signature = "rusEFI 2022.08.27.hellen121vag.148110234" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen121vag.2563932807" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen121vag.148110234" ; 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 Sat Aug 27 14:00:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:36 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 36f40d5adf..1dfff48c60 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen128.369982659" + signature = "rusEFI 2022.08.27.hellen128.2248934878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen128.369982659" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen128.2248934878" ; 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 Sat Aug 27 14:00:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:34 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f86ed1421e..7d8b52273b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen154hyundai.1891382137" + signature = "rusEFI 2022.08.27.hellen154hyundai.3770501732" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen154hyundai.1891382137" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen154hyundai.3770501732" ; 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 Sat Aug 27 14:00:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:40 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 146e7274cd..f3909322c8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen72.449603833" + signature = "rusEFI 2022.08.27.hellen72.2328695268" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen72.449603833" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen72.2328695268" ; 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 Sat Aug 27 14:00:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:45 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index f3551d1a5c..e425568071 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen81.3393624567" + signature = "rusEFI 2022.08.27.hellen81.1514660074" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen81.3393624567" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen81.1514660074" ; 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 Sat Aug 27 14:00:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:47 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5471,7 +5469,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 9cba8bc045..28fe23cd77 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellen88bmw.4245049905" + signature = "rusEFI 2022.08.27.hellen88bmw.1829186348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellen88bmw.4245049905" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellen88bmw.1829186348" ; 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 Sat Aug 27 14:00:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:43 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 43736cdcd0..3785998c5d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellenNA6.755048319" + signature = "rusEFI 2022.08.27.hellenNA6.3170920034" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellenNA6.755048319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellenNA6.3170920034" ; 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 Sat Aug 27 14:00:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:53 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 13e5fae6ae..b9c8148dad 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.hellenNA8_96.1224405013" + signature = "rusEFI 2022.08.27.hellenNA8_96.3640363272" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.hellenNA8_96.1224405013" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.hellenNA8_96.3640363272" ; 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 Sat Aug 27 14:00:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:55 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index d18d6e0cfa..b364747044 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.kin.2149901105" + signature = "rusEFI 2022.08.27.kin.270899756" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.kin.2149901105" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.kin.270899756" ; 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 Sat Aug 27 14:00:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 27 18:43:21 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0beca302d6..2d0d33172e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.mre_f4.656788747" + signature = "rusEFI 2022.08.27.mre_f4.3072635926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.mre_f4.656788747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.mre_f4.3072635926" ; 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 Sat Aug 27 14:00:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:00 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5473,7 +5471,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 20e89ca046..5a54d5594d 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.mre_f7.656788747" + signature = "rusEFI 2022.08.27.mre_f7.3072635926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.mre_f7.656788747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.mre_f7.3072635926" ; 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 Sat Aug 27 14:00:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:43:58 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5473,7 +5471,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 16d2fa6f08..a048c5a9dd 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.prometheus_405.3088685083" + signature = "rusEFI 2022.08.27.prometheus_405.672719110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.prometheus_405.3088685083" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.prometheus_405.672719110" ; 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 Sat Aug 27 14:00:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:10 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5471,7 +5469,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 73d25efdb5..a5e7d2e7d4 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.prometheus_469.3088685083" + signature = "rusEFI 2022.08.27.prometheus_469.672719110" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.prometheus_469.3088685083" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.prometheus_469.672719110" ; 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 Sat Aug 27 14:00:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:08 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5471,7 +5469,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8074fc4ad4..95883b2584 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.proteus_f4.1295943307" + signature = "rusEFI 2022.08.27.proteus_f4.3711958934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.proteus_f4.1295943307" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.proteus_f4.3711958934" ; 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 Sat Aug 27 14:00:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:15 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5469,7 +5467,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0f20bfc849..3583fb5a93 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.proteus_f7.1295943307" + signature = "rusEFI 2022.08.27.proteus_f7.3711958934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.proteus_f7.1295943307" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.proteus_f7.3711958934" ; 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 Sat Aug 27 14:00:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:12 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5469,7 +5467,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 26c7a2022a..5d947070fe 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.proteus_h7.1295943307" + signature = "rusEFI 2022.08.27.proteus_h7.3711958934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.proteus_h7.1295943307" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.proteus_h7.3711958934" ; 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 Sat Aug 27 14:00:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:17 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5469,7 +5467,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 426990beef..bb682f4004 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.subaru_eg33_f7.2798581317" + signature = "rusEFI 2022.08.27.subaru_eg33_f7.919572312" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.subaru_eg33_f7.2798581317" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.subaru_eg33_f7.919572312" ; 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 Sat Aug 27 14:00:05 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 Sat Aug 27 18:43:25 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5472,7 +5470,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index f70e705b2b..6b49541eed 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.08.27.tdg-pdm8.1123782569" + signature = "rusEFI 2022.08.27.tdg-pdm8.3539662516" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.08.27.tdg-pdm8.1123782569" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.08.27.tdg-pdm8.3539662516" ; 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 Sat Aug 27 14:01:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:25 UTC 2022 pageSize = 21300 page = 1 @@ -2122,7 +2122,7 @@ 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] -isFuelPumpOn = bits, U32, 0, [5:5] +unusedb5 = bits, U32, 0, [5:5] isFanOn = bits, U32, 0, [6:6] isO2HeaterOn = bits, U32, 0, [7:7] checkEngine = bits, U32, 0, [8:8] @@ -2827,7 +2827,7 @@ unusedBit_7_31 = bits, U32, 844, [31:31] ; total TS size = 848 isPrime = bits, U32, 848, [0:0] engineTurnedRecently = bits, U32, 848, [1:1] -isPumpOn = bits, U32, 848, [2:2] +isFuelPumpOn = bits, U32, 848, [2:2] ignitionOn = bits, U32, 848, [3:3] unusedBit_4_4 = bits, U32, 848, [4:4] unusedBit_4_5 = bits, U32, 848, [5:5] @@ -4408,7 +4408,6 @@ gaugeCategory = Outputs indicator = { sd_present }, "no SD card", "SD card OK", white, black, green, black indicator = { sd_logging_internal }, "SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "SD USB", "SD USB", white, black, green, black - indicator = { isPumpOn }, "No Pump", "Pump", white, black, green, black indicator = { etbRevLimitActive }, "", "ETB RPM Limit", white, black, yellow, black ; looks like TS would append four system indicators below: Data Logging, ???, Not Connected, Protocol Error @@ -4429,7 +4428,6 @@ 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 = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = isFanOn, "radiator fan", int, "%d" entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" entry = checkEngine, "checkEngine", int, "%d" @@ -4750,7 +4748,7 @@ entry = hot, "hot", int, "%d" entry = cold, "cold", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isPumpOn, "isPumpOn", int, "%d" +entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" entry = ignitionOn, "ignitionOn", int, "%d" entry = isBenchTest, "isBenchTest", int, "%d" entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" @@ -5476,7 +5474,7 @@ dialog = fan_controlDialog, "fan_control" indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isPumpOn}, "isPumpOn No", "isPumpOn Yes" + indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" dialog = fuel_pump_controlDialog, "fuel_pump_control" 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 1074b45619..ed0dd09f0d 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 Sat Aug 27 14:01:14 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 27 18:44:30 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1883,6 +1883,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2086; public static final int servoOutputPins8_offset = 2088; public static final int showHumanReadableWarning_offset = 960; + public static final int SIGNATURE_HASH = 2029140192; public static final int silentTriggerError_offset = 1360; public static final int skippedWheelOnCam_offset = 1360; public static final int slowAdcAlpha_offset = 1600; @@ -2373,7 +2374,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.08.27.all.3908256253"; + public static final String TS_SIGNATURE = "rusEFI 2022.08.27.all.2029140192"; 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 = 1236; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java index aa2c080a86..6c3b6066ab 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelPump.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Mon Aug 15 21:21:43 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/fuel_pump_control.txt Sat Aug 27 18:43:20 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -8,7 +8,7 @@ import com.rusefi.config.*; public class FuelPump { public static final Field ISPRIME = Field.create("ISPRIME", 0, FieldType.BIT, 0); public static final Field ENGINETURNEDRECENTLY = Field.create("ENGINETURNEDRECENTLY", 0, FieldType.BIT, 1); - public static final Field ISPUMPON = Field.create("ISPUMPON", 0, FieldType.BIT, 2); + public static final Field ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 2); public static final Field IGNITIONON = Field.create("IGNITIONON", 0, FieldType.BIT, 3); public static final Field UNUSEDBIT_4_4 = Field.create("UNUSEDBIT_4_4", 0, FieldType.BIT, 4); public static final Field UNUSEDBIT_4_5 = Field.create("UNUSEDBIT_4_5", 0, FieldType.BIT, 5); @@ -41,7 +41,7 @@ public class FuelPump { public static final Field[] VALUES = { ISPRIME, ENGINETURNEDRECENTLY, - ISPUMPON, + ISFUELPUMPON, IGNITIONON, UNUSEDBIT_4_4, UNUSEDBIT_4_5, 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 e10f5ca7f6..c1ad76473c 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 Fri Aug 26 00:40:04 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sat Aug 27 18:43:19 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -391,7 +391,7 @@ public class TsOutputs { 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 ISFUELPUMPON = Field.create("ISFUELPUMPON", 0, FieldType.BIT, 5); + 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); @@ -915,7 +915,7 @@ public class TsOutputs { ISINJECTIONENABLEDINDICATOR, SD_LOGGING_INTERNAL, UNUSEDB4, - ISFUELPUMPON, + UNUSEDB5, ISFANON, ISO2HEATERON, CHECKENGINE,