From d9efbcc9b3b169a71396bd244152115c95720629 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 13 Feb 2023 15:29:25 +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 ++-- .../controllers/generated/rusefi_generated.h | 4 ++-- .../controllers/generated/signature_48way.h | 4 ++-- .../generated/signature_alphax-2chan.h | 4 ++-- .../generated/signature_alphax-4chan.h | 4 ++-- .../generated/signature_alphax-8chan.h | 4 ++-- .../controllers/generated/signature_atlas.h | 4 ++-- .../controllers/generated/signature_core8.h | 4 ++-- .../controllers/generated/signature_cypress.h | 4 ++-- .../generated/signature_f407-discovery.h | 4 ++-- .../generated/signature_f429-discovery.h | 4 ++-- .../generated/signature_frankenso_na6.h | 4 ++-- .../controllers/generated/signature_harley81.h | 4 ++-- .../generated/signature_hellen-gm-e67.h | 4 ++-- .../generated/signature_hellen-honda-k.h | 4 ++-- .../generated/signature_hellen-nb1.h | 4 ++-- .../generated/signature_hellen121nissan.h | 4 ++-- .../generated/signature_hellen121vag.h | 4 ++-- .../generated/signature_hellen128.h | 4 ++-- .../generated/signature_hellen154hyundai.h | 4 ++-- .../controllers/generated/signature_hellen72.h | 4 ++-- .../controllers/generated/signature_hellen81.h | 4 ++-- .../generated/signature_hellen88bmw.h | 4 ++-- .../generated/signature_hellenNA6.h | 4 ++-- .../generated/signature_hellenNA8_96.h | 4 ++-- firmware/controllers/generated/signature_kin.h | 4 ++-- .../controllers/generated/signature_m74_9.h | 4 ++-- .../controllers/generated/signature_mre_f4.h | 4 ++-- .../controllers/generated/signature_mre_f7.h | 4 ++-- .../generated/signature_prometheus_405.h | 4 ++-- .../generated/signature_prometheus_469.h | 4 ++-- .../generated/signature_proteus_f4.h | 4 ++-- .../generated/signature_proteus_f7.h | 4 ++-- .../generated/signature_proteus_h7.h | 4 ++-- .../controllers/generated/signature_s105.h | 4 ++-- .../generated/signature_subaru_eg33_f7.h | 4 ++-- .../controllers/generated/signature_tdg-pdm8.h | 4 ++-- firmware/tunerstudio/generated/rusefi.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 18 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 18 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 18 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 18 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 18 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 18 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 18 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 18 +++++++++--------- .../generated/rusefi_hellen-honda-k.ini | 18 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 18 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 18 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 18 +++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 18 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 18 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_hellenNA6.ini | 18 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 18 +++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_405.ini | 18 +++++++++--------- .../generated/rusefi_prometheus_469.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 18 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 18 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 18 +++++++++--------- firmware/tunerstudio/generated/rusefi_s105.ini | 18 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 18 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 18 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 5 +++-- 76 files changed, 405 insertions(+), 404 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 7eaffd1edf..5dcedb8470 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1046,7 +1046,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 3385467302 +#define SIGNATURE_HASH 891158575 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1322,7 +1322,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.3385467302" +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.891158575" #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 cf2ea3bff1..bfc54334fa 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1046,7 +1046,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2703065962 +#define SIGNATURE_HASH 1573495523 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1322,7 +1322,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.2703065962" +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.1573495523" #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 6b3ebaeb56..165037fdeb 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 @@ -996,7 +996,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3122098955 +#define SIGNATURE_HASH 1187205762 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1273,7 +1273,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.3122098955" +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1187205762" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index a1f953489d..327efa906e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1046,7 +1046,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2709864192 +#define SIGNATURE_HASH 1565597321 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1322,7 +1322,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.2709864192" +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.1565597321" #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 e9bf1651e5..1676ad49a6 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 by SignatureConsumer // -#define SIGNATURE_HASH 1720689350 -#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.1720689350" +#define SIGNATURE_HASH 2589688655 +#define TS_SIGNATURE "rusEFI master.2023.02.13.48way.2589688655" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 11aca9cf94..d3b5ea49ba 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 by SignatureConsumer // -#define SIGNATURE_HASH 2516203541 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.2516203541" +#define SIGNATURE_HASH 1764628892 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-2chan.1764628892" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 1e697aed14..aa3fb1a328 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 by SignatureConsumer // -#define SIGNATURE_HASH 916689955 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.916689955" +#define SIGNATURE_HASH 3396842922 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-4chan.3396842922" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 5128a2bb12..d45bb8c692 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1672904322 -#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.1672904322" +#define SIGNATURE_HASH 2674024203 +#define TS_SIGNATURE "rusEFI master.2023.02.13.alphax-8chan.2674024203" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 615337f0e3..9fdea22d0f 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 by SignatureConsumer // -#define SIGNATURE_HASH 3573601409 -#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.3573601409" +#define SIGNATURE_HASH 701822216 +#define TS_SIGNATURE "rusEFI master.2023.02.13.atlas.701822216" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index af0f205362..20508163b7 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 by SignatureConsumer // -#define SIGNATURE_HASH 443688906 -#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.443688906" +#define SIGNATURE_HASH 3869640259 +#define TS_SIGNATURE "rusEFI master.2023.02.13.core8.3869640259" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 88ac68d6ef..8a29b2af04 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 by SignatureConsumer // -#define SIGNATURE_HASH 3385467302 -#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.3385467302" +#define SIGNATURE_HASH 891158575 +#define TS_SIGNATURE "rusEFI master.2023.02.13.cypress.891158575" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 87c388bb7d..7fa06c3af6 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 by SignatureConsumer // -#define SIGNATURE_HASH 2709864192 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.2709864192" +#define SIGNATURE_HASH 1565597321 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f407-discovery.1565597321" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 2fb29b1dea..e1beb4ccbc 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 by SignatureConsumer // -#define SIGNATURE_HASH 3385467302 -#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.3385467302" +#define SIGNATURE_HASH 891158575 +#define TS_SIGNATURE "rusEFI master.2023.02.13.f429-discovery.891158575" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index c1bb21a479..4387e28ee6 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 by SignatureConsumer // -#define SIGNATURE_HASH 3952656748 -#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.3952656748" +#define SIGNATURE_HASH 390914277 +#define TS_SIGNATURE "rusEFI master.2023.02.13.frankenso_na6.390914277" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 4c53ee9e0e..307c023480 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 by SignatureConsumer // -#define SIGNATURE_HASH 4005795054 -#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.4005795054" +#define SIGNATURE_HASH 303543655 +#define TS_SIGNATURE "rusEFI master.2023.02.13.harley81.303543655" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 5762a15b64..839161039a 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 by SignatureConsumer // -#define SIGNATURE_HASH 3065142049 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.3065142049" +#define SIGNATURE_HASH 1248230056 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-gm-e67.1248230056" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 906da33405..e3ac609b65 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 322609428 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.322609428" +#define SIGNATURE_HASH 4025385117 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-honda-k.4025385117" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index ed19c90b5c..79c1960171 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 by SignatureConsumer // -#define SIGNATURE_HASH 590197031 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.590197031" +#define SIGNATURE_HASH 3757674670 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen-nb1.3757674670" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index bd69396eac..d78291366c 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 by SignatureConsumer // -#define SIGNATURE_HASH 1999479611 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.1999479611" +#define SIGNATURE_HASH 2348384946 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121nissan.2348384946" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 4f3cffdfad..56807713e9 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 by SignatureConsumer // -#define SIGNATURE_HASH 1181636838 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.1181636838" +#define SIGNATURE_HASH 3132782959 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen121vag.3132782959" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index bb404fe059..f56cae9dc2 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 by SignatureConsumer // -#define SIGNATURE_HASH 1878901725 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.1878901725" +#define SIGNATURE_HASH 2468995668 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen128.2468995668" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 5b4522efe8..f2e9d0e5ac 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 by SignatureConsumer // -#define SIGNATURE_HASH 1003525935 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.1003525935" +#define SIGNATURE_HASH 3338974886 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen154hyundai.3338974886" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index b2f98fdcf3..f9c653f0d2 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 by SignatureConsumer // -#define SIGNATURE_HASH 1525421939 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.1525421939" +#define SIGNATURE_HASH 2788701946 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen72.2788701946" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 3b07c6461c..20c43dd543 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 by SignatureConsumer // -#define SIGNATURE_HASH 2399519483 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.2399519483" +#define SIGNATURE_HASH 1943135090 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen81.1943135090" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8a40ab8097..d0419b9b96 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 by SignatureConsumer // -#define SIGNATURE_HASH 3677292407 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.3677292407" +#define SIGNATURE_HASH 670770942 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellen88bmw.670770942" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index e5c820822f..4b7b784c2b 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 by SignatureConsumer // -#define SIGNATURE_HASH 2691209854 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.2691209854" +#define SIGNATURE_HASH 1555872759 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA6.1555872759" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index e7244e349a..b6175309e9 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 by SignatureConsumer // -#define SIGNATURE_HASH 3367573825 -#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.3367573825" +#define SIGNATURE_HASH 879573192 +#define TS_SIGNATURE "rusEFI master.2023.02.13.hellenNA8_96.879573192" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f3871a8a67..25e25737ec 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 by SignatureConsumer // -#define SIGNATURE_HASH 2703065962 -#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.2703065962" +#define SIGNATURE_HASH 1573495523 +#define TS_SIGNATURE "rusEFI master.2023.02.13.kin.1573495523" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 2f00c9e035..00729f84f8 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 373619869 -#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.373619869" +#define SIGNATURE_HASH 3935362324 +#define TS_SIGNATURE "rusEFI master.2023.02.13.m74_9.3935362324" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 8e43faee78..33072c1c9b 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 by SignatureConsumer // -#define SIGNATURE_HASH 3000814247 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.3000814247" +#define SIGNATURE_HASH 1309207342 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f4.1309207342" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2c74bb72d6..b4fffed259 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 by SignatureConsumer // -#define SIGNATURE_HASH 3000814247 -#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.3000814247" +#define SIGNATURE_HASH 1309207342 +#define TS_SIGNATURE "rusEFI master.2023.02.13.mre_f7.1309207342" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e1566e17cc..9a51dcd8a7 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 by SignatureConsumer // -#define SIGNATURE_HASH 2569074752 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.2569074752" +#define SIGNATURE_HASH 1710545353 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_405.1710545353" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index dc79f9e874..c930a2ba22 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 by SignatureConsumer // -#define SIGNATURE_HASH 2569074752 -#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.2569074752" +#define SIGNATURE_HASH 1710545353 +#define TS_SIGNATURE "rusEFI master.2023.02.13.prometheus_469.1710545353" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 5c7fa6d19f..98b7000fee 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 by SignatureConsumer // -#define SIGNATURE_HASH 3876436049 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.3876436049" +#define SIGNATURE_HASH 467245528 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f4.467245528" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2afd20cd45..558c7445b7 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 by SignatureConsumer // -#define SIGNATURE_HASH 3876436049 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.3876436049" +#define SIGNATURE_HASH 467245528 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_f7.467245528" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 868fb682dc..ebd44890d1 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 by SignatureConsumer // -#define SIGNATURE_HASH 3876436049 -#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.3876436049" +#define SIGNATURE_HASH 467245528 +#define TS_SIGNATURE "rusEFI master.2023.02.13.proteus_h7.467245528" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index c7c7597a84..65110adc5c 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1882523528 -#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.1882523528" +#define SIGNATURE_HASH 2363565569 +#define TS_SIGNATURE "rusEFI master.2023.02.13.s105.2363565569" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index c1e2a55ebd..ab3ecd1d11 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 by SignatureConsumer // -#define SIGNATURE_HASH 3122098955 -#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.3122098955" +#define SIGNATURE_HASH 1187205762 +#define TS_SIGNATURE "rusEFI master.2023.02.13.subaru_eg33_f7.1187205762" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 47ca42270f..38ae907c09 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 by SignatureConsumer // -#define SIGNATURE_HASH 1130630532 -#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.1130630532" +#define SIGNATURE_HASH 3215993869 +#define TS_SIGNATURE "rusEFI master.2023.02.13.tdg-pdm8.3215993869" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 83ab4e7ba1..63abf6160a 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 master.2023.02.13.f407-discovery.2709864192" + signature = "rusEFI master.2023.02.13.f407-discovery.1565597321" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.2709864192" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.1565597321" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:10 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:21 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7724,11 +7724,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 3833f1b079..eb8f8f9776 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 master.2023.02.13.48way.1720689350" + signature = "rusEFI master.2023.02.13.48way.2589688655" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.48way.1720689350" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.48way.2589688655" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:54 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:06 UTC 2023 pageSize = 22432 page = 1 @@ -6226,7 +6226,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6235,7 +6235,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7717,11 +7717,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index bf97fc168c..cb16ed53a8 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 master.2023.02.13.alphax-2chan.2516203541" + signature = "rusEFI master.2023.02.13.alphax-2chan.1764628892" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-2chan.2516203541" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-2chan.1764628892" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:30 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:42 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7695,11 +7695,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index e90596b325..9b67495282 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 master.2023.02.13.alphax-4chan.916689955" + signature = "rusEFI master.2023.02.13.alphax-4chan.3396842922" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-4chan.916689955" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-4chan.3396842922" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:31 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:44 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7699,11 +7699,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 5ff0ab8c9c..7f119559ce 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.alphax-8chan.1672904322" + signature = "rusEFI master.2023.02.13.alphax-8chan.2674024203" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.alphax-8chan.1672904322" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.alphax-8chan.2674024203" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:33 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:45 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7699,11 +7699,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index cc0cb4ba8b..119e0b982a 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 master.2023.02.13.atlas.3573601409" + signature = "rusEFI master.2023.02.13.atlas.701822216" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.atlas.3573601409" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.atlas.701822216" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:07 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:19 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7713,11 +7713,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 7f30481c5a..a2abadf4e8 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 master.2023.02.13.core8.443688906" + signature = "rusEFI master.2023.02.13.core8.3869640259" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.core8.443688906" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.core8.3869640259" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:53 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:05 UTC 2023 pageSize = 22432 page = 1 @@ -6226,7 +6226,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6235,7 +6235,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7717,11 +7717,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index a9e3fad279..05f17b94b6 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 master.2023.02.13.cypress.3385467302" + signature = "rusEFI master.2023.02.13.cypress.891158575" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.cypress.3385467302" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.cypress.891158575" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 13 15:17:28 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Feb 13 15:28:40 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7722,11 +7722,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 086f46d405..d74fea3e97 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 master.2023.02.13.f407-discovery.2709864192" + signature = "rusEFI master.2023.02.13.f407-discovery.1565597321" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f407-discovery.2709864192" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f407-discovery.1565597321" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:05 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:17 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7724,11 +7724,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 8e5f106ad0..3ca65f7a66 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 master.2023.02.13.f429-discovery.3385467302" + signature = "rusEFI master.2023.02.13.f429-discovery.891158575" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.f429-discovery.3385467302" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.f429-discovery.891158575" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:06 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:18 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7722,11 +7722,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a63e115416..6538239d00 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 master.2023.02.13.frankenso_na6.3952656748" + signature = "rusEFI master.2023.02.13.frankenso_na6.390914277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.frankenso_na6.3952656748" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.frankenso_na6.390914277" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:57 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:09 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7722,11 +7722,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 17ffa5e692..1a712572de 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 master.2023.02.13.harley81.4005795054" + signature = "rusEFI master.2023.02.13.harley81.303543655" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.harley81.4005795054" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.harley81.303543655" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:34 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:46 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7696,11 +7696,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 7b95f256e7..4ed8603d87 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 master.2023.02.13.hellen-gm-e67.3065142049" + signature = "rusEFI master.2023.02.13.hellen-gm-e67.1248230056" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-gm-e67.3065142049" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-gm-e67.1248230056" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:46 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:59 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7697,11 +7697,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index ac4de432b6..fcccb81a9f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.hellen-honda-k.322609428" + signature = "rusEFI master.2023.02.13.hellen-honda-k.4025385117" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-honda-k.322609428" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-honda-k.4025385117" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:39 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:51 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7693,11 +7693,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 8f048a0361..b2639fe780 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 master.2023.02.13.hellen-nb1.590197031" + signature = "rusEFI master.2023.02.13.hellen-nb1.3757674670" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen-nb1.590197031" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen-nb1.3757674670" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:45 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:57 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7697,11 +7697,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index cb879bd43f..ec6022dcbf 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 master.2023.02.13.hellen121nissan.1999479611" + signature = "rusEFI master.2023.02.13.hellen121nissan.2348384946" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121nissan.1999479611" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121nissan.2348384946" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:38 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:50 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7693,11 +7693,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index bb55f16e91..97767aae9d 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 master.2023.02.13.hellen121vag.1181636838" + signature = "rusEFI master.2023.02.13.hellen121vag.3132782959" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen121vag.1181636838" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen121vag.3132782959" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:36 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:49 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7696,11 +7696,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 58799e3e75..f23c2a3b6b 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 master.2023.02.13.hellen128.1878901725" + signature = "rusEFI master.2023.02.13.hellen128.2468995668" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen128.1878901725" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen128.2468995668" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:35 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:47 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7693,11 +7693,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index c5393282c2..ecb0e056ff 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 master.2023.02.13.hellen154hyundai.1003525935" + signature = "rusEFI master.2023.02.13.hellen154hyundai.3338974886" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen154hyundai.1003525935" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen154hyundai.3338974886" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:40 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:52 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7693,11 +7693,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index adc78a94a7..80566956bc 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 master.2023.02.13.hellen72.1525421939" + signature = "rusEFI master.2023.02.13.hellen72.2788701946" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen72.1525421939" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen72.2788701946" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:43 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:55 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7697,11 +7697,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index d6e7cd14e2..84559a6f16 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 master.2023.02.13.hellen81.2399519483" + signature = "rusEFI master.2023.02.13.hellen81.1943135090" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen81.2399519483" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen81.1943135090" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:44 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:56 UTC 2023 pageSize = 22432 page = 1 @@ -6223,7 +6223,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6232,7 +6232,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7694,11 +7694,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 37d8327f72..5ee4f32247 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 master.2023.02.13.hellen88bmw.3677292407" + signature = "rusEFI master.2023.02.13.hellen88bmw.670770942" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellen88bmw.3677292407" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellen88bmw.670770942" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:41 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:54 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7692,11 +7692,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 61ae960e77..dd73bcd52e 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 master.2023.02.13.hellenNA6.2691209854" + signature = "rusEFI master.2023.02.13.hellenNA6.1555872759" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA6.2691209854" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA6.1555872759" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:48 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:00 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7697,11 +7697,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 57abc2debc..0a09c522cf 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 master.2023.02.13.hellenNA8_96.3367573825" + signature = "rusEFI master.2023.02.13.hellenNA8_96.879573192" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.hellenNA8_96.3367573825" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.hellenNA8_96.879573192" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:49 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:01 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7697,11 +7697,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index e0416bf266..6bbabfd2d9 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 master.2023.02.13.kin.2703065962" + signature = "rusEFI master.2023.02.13.kin.1573495523" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.kin.2703065962" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.kin.1573495523" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 13 15:17:26 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Feb 13 15:28:39 UTC 2023 pageSize = 22432 page = 1 @@ -6229,7 +6229,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6238,7 +6238,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7723,11 +7723,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index ae3a414bc7..adbf6de34d 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.m74_9.373619869" + signature = "rusEFI master.2023.02.13.m74_9.3935362324" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.m74_9.373619869" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.m74_9.3935362324" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:55 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:07 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7699,11 +7699,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 66142909bb..d9631445e9 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 master.2023.02.13.mre_f4.3000814247" + signature = "rusEFI master.2023.02.13.mre_f4.1309207342" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f4.3000814247" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f4.1309207342" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:51 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:04 UTC 2023 pageSize = 22432 page = 1 @@ -6226,7 +6226,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6235,7 +6235,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7695,11 +7695,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 6f5caa62e0..fad9838c56 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 master.2023.02.13.mre_f7.3000814247" + signature = "rusEFI master.2023.02.13.mre_f7.1309207342" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.mre_f7.3000814247" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.mre_f7.1309207342" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:50 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:02 UTC 2023 pageSize = 22432 page = 1 @@ -6226,7 +6226,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6235,7 +6235,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7695,11 +7695,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 5053c7a692..2c16f10355 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 master.2023.02.13.prometheus_405.2569074752" + signature = "rusEFI master.2023.02.13.prometheus_405.1710545353" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_405.2569074752" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_405.1710545353" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:00 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:12 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7716,11 +7716,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 4de9cc15ba..2cf8acf4bb 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 master.2023.02.13.prometheus_469.2569074752" + signature = "rusEFI master.2023.02.13.prometheus_469.1710545353" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.prometheus_469.2569074752" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.prometheus_469.1710545353" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:59 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:11 UTC 2023 pageSize = 22432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7716,11 +7716,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7d43dd36e0..bbb97d7c12 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 master.2023.02.13.proteus_f4.3876436049" + signature = "rusEFI master.2023.02.13.proteus_f4.467245528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f4.3876436049" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f4.467245528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:02 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:14 UTC 2023 pageSize = 26432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7685,11 +7685,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index a2a8a33404..54f940c1be 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 master.2023.02.13.proteus_f7.3876436049" + signature = "rusEFI master.2023.02.13.proteus_f7.467245528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_f7.3876436049" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_f7.467245528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:01 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:13 UTC 2023 pageSize = 26432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7685,11 +7685,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 6e35167ceb..3924865290 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 master.2023.02.13.proteus_h7.3876436049" + signature = "rusEFI master.2023.02.13.proteus_h7.467245528" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.proteus_h7.3876436049" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.proteus_h7.467245528" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:04 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:15 UTC 2023 pageSize = 26432 page = 1 @@ -6222,7 +6222,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6231,7 +6231,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7685,11 +7685,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index ea8a94d2e0..6aa1fea39d 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.02.13.s105.1882523528" + signature = "rusEFI master.2023.02.13.s105.2363565569" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.s105.1882523528" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.s105.2363565569" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:56 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:08 UTC 2023 pageSize = 22432 page = 1 @@ -6225,7 +6225,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6234,7 +6234,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7699,11 +7699,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 815f6a5ef4..98f72de33e 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 master.2023.02.13.subaru_eg33_f7.3122098955" + signature = "rusEFI master.2023.02.13.subaru_eg33_f7.1187205762" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.subaru_eg33_f7.3122098955" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.subaru_eg33_f7.1187205762" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 13 15:17:29 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Feb 13 15:28:41 UTC 2023 pageSize = 22432 page = 1 @@ -6224,7 +6224,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6233,7 +6233,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7711,11 +7711,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 1106cb9795..f75fd40f21 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 master.2023.02.13.tdg-pdm8.1130630532" + signature = "rusEFI master.2023.02.13.tdg-pdm8.3215993869" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.02.13.tdg-pdm8.1130630532" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.02.13.tdg-pdm8.3215993869" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:09 UTC 2023 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:20 UTC 2023 pageSize = 22432 page = 1 @@ -6228,7 +6228,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps1_2AdcChannel, {tps1_1AdcChannel != 0} field = "Secondary min", tps1SecondaryMin, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} field = "Secondary max", tps1SecondaryMax, {tps1_2AdcChannel != 0 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsNum2, "Throttle Body #2" field = "Primary sensor", tps2_1AdcChannel @@ -6237,7 +6237,7 @@ dialog = wideband_stateDialog, "wideband_state" field = "Secondary sensor", tps2_2AdcChannel, {tps2_1AdcChannel != 0} field = "Secondary min", tps2SecondaryMin, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} field = "Secondary max", tps2SecondaryMax, {tps2_2AdcChannel != 0 && tps2_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} dialog = tpsLimits, "TPS Limits" field = "TPS minimum valid value", tpsErrorDetectionTooLow, {tps1_1AdcChannel != 0} @@ -7722,11 +7722,11 @@ dialog = tcuControls, "Transmission Settings" dialog = etbAutotune, "PID Autotune" field = "First step: calibrate TPS and hit 'Burn'" - commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0} - commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0} + commandButton = "Auto Calibrate ETB 1", cmd_etb_auto_calibrate, {etb1configured == 1 && tps1_1AdcChannel != 0 && calibrationMode == 0} + commandButton = "Auto Calibrate ETB 2", cmd_etb_auto_calibrate_2, {etb2configured == 1 && tps2_1AdcChannel != 0 && calibrationMode == 0} field = "Second step" - commandButton = "Start ETB PID Autotune", cmd_etb_autotune, { etb1configured == 1 || etb2configured == 1 } - commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, { etb1configured == 1 || etb2configured == 1 } + commandButton = "Start ETB PID Autotune", cmd_etb_autotune, {(etb1configured == 1 || etb2configured == 1) && calibrationMode = 0} + commandButton = "Stop ETB PID Autotune", cmd_etb_autotune_stop, {(etb1configured == 1 || etb2configured == 1) && calibrationMode >= 3 && calibrationMode <= 5} field = "!Set debug mode below to 'ETB Autotune' to show more detail" field = "Debug mode", debugMode 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 745cf577fe..f1c6499f96 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:18:11 UTC 2023 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Feb 13 15:29:24 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -994,6 +994,7 @@ public class Fields { public static final int sensor_chart_e_SC_RPM_ACCEL = 3; public static final int sensor_chart_e_SC_TRIGGER = 1; public static final int SENT_INPUT_COUNT = 1; + public static final int SIGNATURE_HASH = 1565597321; public static final int specs_s_size = 12; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1203,7 +1204,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 master.2023.02.13.f407-discovery.2709864192"; + public static final String TS_SIGNATURE = "rusEFI master.2023.02.13.f407-discovery.1565597321"; 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 = 1316;