From 50641876a6f562805583ef612a071ec37a9335f6 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 26 May 2022 01:57:11 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 4 +-- .../controllers/algo/rusefi_generated.h | 4 +-- .../controllers/algo/rusefi_generated.h | 4 +-- .../controllers/generated/rusefi_generated.h | 4 +-- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../controllers/generated/signature_core8.h | 4 +-- .../generated/signature_f407-discovery.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_harley81.h | 4 +-- .../generated/signature_hellen-gm-e67.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen81.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellenNA8_96.h | 4 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_proteus_h7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- firmware/tunerstudio/generated/rusefi.ini | 26 +++++++++---------- .../generated/rusefi_alphax-2chan.ini | 26 +++++++++---------- .../generated/rusefi_alphax-4chan.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 26 +++++++++---------- .../generated/rusefi_f407-discovery.ini | 26 +++++++++---------- .../generated/rusefi_f429-discovery.ini | 26 +++++++++---------- .../generated/rusefi_frankenso_na6.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 26 +++++++++---------- .../generated/rusefi_hellen-gm-e67.ini | 26 +++++++++---------- .../generated/rusefi_hellen-nb1.ini | 26 +++++++++---------- .../generated/rusefi_hellen121nissan.ini | 26 +++++++++---------- .../generated/rusefi_hellen121vag.ini | 26 +++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 26 +++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 26 +++++++++---------- .../generated/rusefi_hellen88bmw.ini | 26 +++++++++---------- .../generated/rusefi_hellenNA6.ini | 26 +++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 26 +++++++++---------- .../generated/rusefi_hellen_cypress.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_kinetis.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 26 +++++++++---------- .../generated/rusefi_prometheus_405.ini | 26 +++++++++---------- .../generated/rusefi_prometheus_469.ini | 26 +++++++++---------- .../generated/rusefi_proteus_f4.ini | 22 ++++++++-------- .../generated/rusefi_proteus_f7.ini | 22 ++++++++-------- .../generated/rusefi_proteus_h7.ini | 22 ++++++++-------- .../generated/rusefi_subaru_eg33_f7.ini | 26 +++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 26 +++++++++---------- .../com/rusefi/config/generated/Fields.java | 6 ++--- 67 files changed, 470 insertions(+), 470 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index 9e27576426..e7df01bef4 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -1923,7 +1923,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1245520143 +#define SIGNATURE_HASH 650216348 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2508,7 +2508,7 @@ #define ts_show_tunerstudio_port true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen_cypress.1245520143" +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen_cypress.650216348" #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 d324747318..5ad50495e4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1909,7 +1909,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 343819906 +#define SIGNATURE_HASH 2021843985 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2494,7 +2494,7 @@ #define ts_show_tunerstudio_port true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.05.25.kin.343819906" +#define TS_SIGNATURE "rusEFI 2022.05.26.kin.2021843985" #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 bfb5dc4a08..30a97b9a5c 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 @@ -1889,7 +1889,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 1615888260 +#define SIGNATURE_HASH 212655383 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2475,7 +2475,7 @@ #define ts_show_tunerstudio_port false #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.05.25.subaru_eg33_f7.1615888260" +#define TS_SIGNATURE "rusEFI 2022.05.26.subaru_eg33_f7.212655383" #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 fcbe9dd4f4..992f3141dc 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1923,7 +1923,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 940 -#define SIGNATURE_HASH 252800773 +#define SIGNATURE_HASH 1676529046 #define silentTriggerError_offset 1340 #define skippedWheelOnCam_offset 1340 #define slowAdcAlpha_offset 1580 @@ -2508,7 +2508,7 @@ #define ts_show_tunerstudio_port true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.05.25.all.252800773" +#define TS_SIGNATURE "rusEFI 2022.05.26.all.1676529046" #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_all.h b/firmware/controllers/generated/signature_all.h index 597d82d058..562bd535dd 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 252800773 -#define TS_SIGNATURE "rusEFI 2022.05.25.all.252800773" +#define SIGNATURE_HASH 1676529046 +#define TS_SIGNATURE "rusEFI 2022.05.26.all.1676529046" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 84a1877623..fdb8de2298 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1023668841 -#define TS_SIGNATURE "rusEFI 2022.05.25.alphax-2chan.1023668841" +#define SIGNATURE_HASH 1375686906 +#define TS_SIGNATURE "rusEFI 2022.05.26.alphax-2chan.1375686906" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 7f08c4600f..d775445a64 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 748519494 -#define TS_SIGNATURE "rusEFI 2022.05.25.alphax-4chan.748519494" +#define SIGNATURE_HASH 1080107733 +#define TS_SIGNATURE "rusEFI 2022.05.26.alphax-4chan.1080107733" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 619810aae7..8864c6d0fe 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 333158946 -#define TS_SIGNATURE "rusEFI 2022.05.25.atlas.333158946" +#define SIGNATURE_HASH 2133276849 +#define TS_SIGNATURE "rusEFI 2022.05.26.atlas.2133276849" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 5e85d1b9dc..3ca28a7c7a 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4194123516 -#define TS_SIGNATURE "rusEFI 2022.05.25.core8.4194123516" +#define SIGNATURE_HASH 2499910767 +#define TS_SIGNATURE "rusEFI 2022.05.26.core8.2499910767" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index e7a3813c71..89d75191c5 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 252800773 -#define TS_SIGNATURE "rusEFI 2022.05.25.f407-discovery.252800773" +#define SIGNATURE_HASH 1676529046 +#define TS_SIGNATURE "rusEFI 2022.05.26.f407-discovery.1676529046" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 7b5c80d67c..cd171ab137 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 252800773 -#define TS_SIGNATURE "rusEFI 2022.05.25.f429-discovery.252800773" +#define SIGNATURE_HASH 1676529046 +#define TS_SIGNATURE "rusEFI 2022.05.26.f429-discovery.1676529046" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index ae8c7d9aeb..78259f1de7 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1300075457 -#define TS_SIGNATURE "rusEFI 2022.05.25.frankenso_na6.1300075457" +#define SIGNATURE_HASH 562114898 +#define TS_SIGNATURE "rusEFI 2022.05.26.frankenso_na6.562114898" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 0df61ab6cb..676f76b2a0 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2080190586 -#define TS_SIGNATURE "rusEFI 2022.05.25.harley81.2080190586" +#define SIGNATURE_HASH 385979113 +#define TS_SIGNATURE "rusEFI 2022.05.26.harley81.385979113" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 4d89234eac..2546f83743 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1221306780 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen-gm-e67.1221306780" +#define SIGNATURE_HASH 607587087 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen-gm-e67.607587087" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 4031cf7806..b91e479309 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2538390723 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen-nb1.2538390723" +#define SIGNATURE_HASH 4222641744 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen-nb1.4222641744" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index f589c2ab4d..73a6a4bf8d 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3515203696 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen121nissan.3515203696" +#define SIGNATURE_HASH 3178848995 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen121nissan.3178848995" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index ce4d61c0f9..7258ea6bc5 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1251411327 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen121vag.1251411327" +#define SIGNATURE_HASH 644589548 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen121vag.644589548" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 2eff05a29a..c5f69f8c21 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1631237076 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen128.1631237076" +#define SIGNATURE_HASH 231084359 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen128.231084359" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index e83a1c99ea..77bb224432 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2539527553 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen154hyundai.2539527553" +#define SIGNATURE_HASH 4221746962 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen154hyundai.4221746962" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index d3e7ae9ab3..b19265a405 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3484485517 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen72.3484485517" +#define SIGNATURE_HASH 2739774750 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen72.2739774750" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index cdacbe1552..ec4e487781 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 4064980904 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen81.4064980904" +#define SIGNATURE_HASH 2662731067 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen81.2662731067" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 47e2853472..76c751fa3a 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1401334177 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen88bmw.1401334177" +#define SIGNATURE_HASH 1064962866 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen88bmw.1064962866" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index bd59ed6847..a9c7c302b6 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2375720549 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellenNA6.2375720549" +#define SIGNATURE_HASH 3781573878 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellenNA6.3781573878" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index df4123d6d3..2ac453c6c1 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 844630988 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellenNA8_96.844630988" +#define SIGNATURE_HASH 1587849567 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellenNA8_96.1587849567" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 70fd022759..b222a6c0b4 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 1245520143 -#define TS_SIGNATURE "rusEFI 2022.05.25.hellen_cypress.1245520143" +#define SIGNATURE_HASH 650216348 +#define TS_SIGNATURE "rusEFI 2022.05.26.hellen_cypress.650216348" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index c9e3bee37a..f1e4016159 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 343819906 -#define TS_SIGNATURE "rusEFI 2022.05.25.kin.343819906" +#define SIGNATURE_HASH 2021843985 +#define TS_SIGNATURE "rusEFI 2022.05.26.kin.2021843985" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index d536712b8f..8d65e8f576 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1107545777 -#define TS_SIGNATURE "rusEFI 2022.05.25.mre_f4.1107545777" +#define SIGNATURE_HASH 788491298 +#define TS_SIGNATURE "rusEFI 2022.05.26.mre_f4.788491298" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a727ec2443..4a0c226a2f 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1107545777 -#define TS_SIGNATURE "rusEFI 2022.05.25.mre_f7.1107545777" +#define SIGNATURE_HASH 788491298 +#define TS_SIGNATURE "rusEFI 2022.05.26.mre_f7.788491298" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 406f13e1f4..603332c3e1 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1610331875 -#define TS_SIGNATURE "rusEFI 2022.05.25.prometheus_405.1610331875" +#define SIGNATURE_HASH 856102000 +#define TS_SIGNATURE "rusEFI 2022.05.26.prometheus_405.856102000" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index ce120da928..d6ff652e53 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1610331875 -#define TS_SIGNATURE "rusEFI 2022.05.25.prometheus_469.1610331875" +#define SIGNATURE_HASH 856102000 +#define TS_SIGNATURE "rusEFI 2022.05.26.prometheus_469.856102000" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 687e399f7c..6db3fce4a7 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2873992045 -#define TS_SIGNATURE "rusEFI 2022.05.25.proteus_f4.2873992045" +#define SIGNATURE_HASH 3350266366 +#define TS_SIGNATURE "rusEFI 2022.05.26.proteus_f4.3350266366" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index e4cc011c03..ed51c82f37 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2873992045 -#define TS_SIGNATURE "rusEFI 2022.05.25.proteus_f7.2873992045" +#define SIGNATURE_HASH 3350266366 +#define TS_SIGNATURE "rusEFI 2022.05.26.proteus_f7.3350266366" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index f1bb8c46da..521f1ada3d 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2873992045 -#define TS_SIGNATURE "rusEFI 2022.05.25.proteus_h7.2873992045" +#define SIGNATURE_HASH 3350266366 +#define TS_SIGNATURE "rusEFI 2022.05.26.proteus_h7.3350266366" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index d69344aa8b..57b7635afa 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 1615888260 -#define TS_SIGNATURE "rusEFI 2022.05.25.subaru_eg33_f7.1615888260" +#define SIGNATURE_HASH 212655383 +#define TS_SIGNATURE "rusEFI 2022.05.26.subaru_eg33_f7.212655383" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 38978177db..df40c12846 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2769920337 -#define TS_SIGNATURE "rusEFI 2022.05.25.tdg-pdm8.2769920337" +#define SIGNATURE_HASH 3387229122 +#define TS_SIGNATURE "rusEFI 2022.05.26.tdg-pdm8.3387229122" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 649359faa6..cd42099ab3 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.all.252800773" + signature = "rusEFI 2022.05.26.all.1676529046" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.all.252800773" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.all.1676529046" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:19 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index ea2251d38c..d637b8f6d6 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.alphax-2chan.1023668841" + signature = "rusEFI 2022.05.26.alphax-2chan.1375686906" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.alphax-2chan.1023668841" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.alphax-2chan.1375686906" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:42 UTC 2022 pageSize = 21352 page = 1 @@ -5538,10 +5538,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7016,7 +7016,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index bb420a6a69..5311c14f0b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.alphax-4chan.748519494" + signature = "rusEFI 2022.05.26.alphax-4chan.1080107733" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.alphax-4chan.748519494" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.alphax-4chan.1080107733" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:44 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5991,8 +5991,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6647,7 +6647,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7252,7 +7252,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7290,7 +7290,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 36ab790666..3209241190 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.atlas.333158946" + signature = "rusEFI 2022.05.26.atlas.2133276849" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.atlas.333158946" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.atlas.2133276849" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:16 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6001,8 +6001,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6657,7 +6657,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7034,7 +7034,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7282,7 +7282,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7320,7 +7320,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 97f379bfc9..8877592c2d 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.core8.4194123516" + signature = "rusEFI 2022.05.26.core8.2499910767" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.core8.4194123516" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.core8.2499910767" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:04 UTC 2022 pageSize = 21352 page = 1 @@ -5541,10 +5541,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6004,8 +6004,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #8", auxAnalogInputs8 field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6660,7 +6660,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7036,7 +7036,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7282,7 +7282,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7320,7 +7320,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 04aa9e912a..75378185a9 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.f407-discovery.252800773" + signature = "rusEFI 2022.05.26.f407-discovery.1676529046" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.f407-discovery.252800773" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.f407-discovery.1676529046" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 17:36:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:14 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 19f44c434b..0ed7835252 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.f429-discovery.252800773" + signature = "rusEFI 2022.05.26.f429-discovery.1676529046" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.f429-discovery.252800773" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.f429-discovery.1676529046" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:15 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a78b9b44a9..5762228c36 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.frankenso_na6.1300075457" + signature = "rusEFI 2022.05.26.frankenso_na6.562114898" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.frankenso_na6.1300075457" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.frankenso_na6.562114898" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:06 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 41e74b3435..21b2c474f5 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.harley81.2080190586" + signature = "rusEFI 2022.05.26.harley81.385979113" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.harley81.2080190586" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.harley81.385979113" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:45 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7016,7 +7016,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7252,7 +7252,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7290,7 +7290,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 181b612a1e..b586715ed6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen-gm-e67.1221306780" + signature = "rusEFI 2022.05.26.hellen-gm-e67.607587087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen-gm-e67.1221306780" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen-gm-e67.607587087" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:57 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7252,7 +7252,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7290,7 +7290,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index fff3798a89..892cb44e05 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen-nb1.2538390723" + signature = "rusEFI 2022.05.26.hellen-nb1.4222641744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen-nb1.2538390723" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen-nb1.4222641744" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:56 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7253,7 +7253,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 3594b00a83..4904d77794 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen121nissan.3515203696" + signature = "rusEFI 2022.05.26.hellen121nissan.3178848995" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen121nissan.3515203696" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen121nissan.3178848995" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:49 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7013,7 +7013,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c6aea6d43c..c2a61a61c5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen121vag.1251411327" + signature = "rusEFI 2022.05.26.hellen121vag.644589548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen121vag.1251411327" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen121vag.644589548" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:48 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7016,7 +7016,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7256,7 +7256,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7294,7 +7294,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index b8873c827d..8663ded5bf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen128.1631237076" + signature = "rusEFI 2022.05.26.hellen128.231084359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen128.1631237076" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen128.231084359" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:46 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7013,7 +7013,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index bcdab2921e..9ebc487648 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen154hyundai.2539527553" + signature = "rusEFI 2022.05.26.hellen154hyundai.4221746962" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen154hyundai.2539527553" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen154hyundai.4221746962" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:08:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:51 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7013,7 +7013,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7250,7 +7250,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7288,7 +7288,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 94d0d0d0a9..43f23bb57b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen72.3484485517" + signature = "rusEFI 2022.05.26.hellen72.2739774750" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen72.3484485517" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen72.2739774750" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:53 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7253,7 +7253,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index c86095c9a7..7b08a53a55 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen81.4064980904" + signature = "rusEFI 2022.05.26.hellen81.2662731067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen81.4064980904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen81.2662731067" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:55 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5992,8 +5992,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6648,7 +6648,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7015,7 +7015,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7250,7 +7250,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7288,7 +7288,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 390ab5bf00..1b87935aac 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen88bmw.1401334177" + signature = "rusEFI 2022.05.26.hellen88bmw.1064962866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen88bmw.1401334177" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen88bmw.1064962866" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:52 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5990,8 +5990,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6646,7 +6646,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7013,7 +7013,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7248,7 +7248,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7286,7 +7286,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index bd899a95a1..d3255f7725 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellenNA6.2375720549" + signature = "rusEFI 2022.05.26.hellenNA6.3781573878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellenNA6.2375720549" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellenNA6.3781573878" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:54:59 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7254,7 +7254,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7292,7 +7292,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index d8fde7ea2f..ab15fc4d9b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellenNA8_96.844630988" + signature = "rusEFI 2022.05.26.hellenNA8_96.1587849567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellenNA8_96.844630988" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellenNA8_96.1587849567" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:00 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5993,8 +5993,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7017,7 +7017,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7253,7 +7253,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 9f527b9708..1fffbd1660 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.hellen_cypress.1245520143" + signature = "rusEFI 2022.05.26.hellen_cypress.650216348" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.hellen_cypress.1245520143" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.hellen_cypress.650216348" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed May 25 00:09:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Thu May 26 01:55:21 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 2649e2dbc4..7885491894 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.kin.343819906" + signature = "rusEFI 2022.05.26.kin.2021843985" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.kin.343819906" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.kin.2021843985" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed May 25 00:09:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu May 26 01:55:20 UTC 2022 pageSize = 21324 page = 1 @@ -5505,10 +5505,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } panel = triggerInputComparator @@ -5971,8 +5971,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6627,7 +6627,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7004,7 +7004,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7253,7 +7253,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 6010cc1d03..6d5c143be2 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.mre_f4.1107545777" + signature = "rusEFI 2022.05.26.mre_f4.788491298" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.mre_f4.1107545777" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.mre_f4.788491298" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:03 UTC 2022 pageSize = 21352 page = 1 @@ -5541,10 +5541,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5994,8 +5994,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7018,7 +7018,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7261,7 +7261,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7299,7 +7299,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index b7010618dd..721c6c7b8e 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.mre_f7.1107545777" + signature = "rusEFI 2022.05.26.mre_f7.788491298" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.mre_f7.1107545777" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.mre_f7.788491298" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:01 UTC 2022 pageSize = 21352 page = 1 @@ -5541,10 +5541,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -5994,8 +5994,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #6", auxAnalogInputs6 field = "Aux ADC #7", auxAnalogInputs7 field = "Aux ADC #8", auxAnalogInputs8 - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6649,7 +6649,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7018,7 +7018,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7261,7 +7261,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7299,7 +7299,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c3c3a8a7f7..e6ca108dd6 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.prometheus_405.1610331875" + signature = "rusEFI 2022.05.26.prometheus_405.856102000" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.prometheus_405.1610331875" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.prometheus_405.856102000" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:08 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6004,8 +6004,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6660,7 +6660,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7037,7 +7037,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7286,7 +7286,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7324,7 +7324,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index a4a1c0d63b..0bc0d9d68c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.prometheus_469.1610331875" + signature = "rusEFI 2022.05.26.prometheus_469.856102000" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.prometheus_469.1610331875" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.prometheus_469.856102000" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:07 UTC 2022 pageSize = 21352 page = 1 @@ -5539,10 +5539,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6004,8 +6004,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6660,7 +6660,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7037,7 +7037,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7286,7 +7286,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7324,7 +7324,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a6133ae5e6..39386cd852 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.proteus_f4.2873992045" + signature = "rusEFI 2022.05.26.proteus_f4.3350266366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.proteus_f4.2873992045" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.proteus_f4.3350266366" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:11 UTC 2022 pageSize = 21352 page = 1 @@ -5537,10 +5537,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6642,7 +6642,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7007,7 +7007,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0beda39580..c31540048b 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.proteus_f7.2873992045" + signature = "rusEFI 2022.05.26.proteus_f7.3350266366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.proteus_f7.2873992045" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.proteus_f7.3350266366" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:10 UTC 2022 pageSize = 21352 page = 1 @@ -5537,10 +5537,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6642,7 +6642,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7007,7 +7007,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 449278061a..8a640a1e6a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.proteus_h7.2873992045" + signature = "rusEFI 2022.05.26.proteus_h7.3350266366" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.proteus_h7.2873992045" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.proteus_h7.3350266366" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:12 UTC 2022 pageSize = 21352 page = 1 @@ -5537,10 +5537,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6642,7 +6642,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7007,7 +7007,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7251,7 +7251,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7289,7 +7289,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 383f8db0df..2a3d6e6114 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.subaru_eg33_f7.1615888260" + signature = "rusEFI 2022.05.26.subaru_eg33_f7.212655383" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.subaru_eg33_f7.1615888260" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.subaru_eg33_f7.212655383" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed May 25 00:09:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Thu May 26 01:55:22 UTC 2022 pageSize = 21352 page = 1 @@ -5540,10 +5540,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6003,8 +6003,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Aux ADC #8", auxAnalogInputs8 field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6659,7 +6659,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7031,7 +7031,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7275,7 +7275,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7313,7 +7313,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 171be64fde..bbe785b62b 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.05.25.tdg-pdm8.2769920337" + signature = "rusEFI 2022.05.26.tdg-pdm8.3387229122" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.05.25.tdg-pdm8.2769920337" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.05.26.tdg-pdm8.3387229122" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed May 25 00:09:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:18 UTC 2022 pageSize = 21352 page = 1 @@ -5544,10 +5544,10 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (trigger_type == 1 || trigger_type == 2 || trigger_type == 3 || trigger_type == 4 || trigger_type == 11 || trigger_type == 12 || trigger_type == 13 || trigger_type == 15 || trigger_type == 16 || trigger_type == 19 || trigger_type == 21 || trigger_type == 25 || trigger_type == 28 || trigger_type == 29 || trigger_type == 31 || trigger_type == 34 || trigger_type == 35 || trigger_type == 36 || trigger_type == 37 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64) } field = "#VVT or Cam for 60/2 goes below" field = "#If your engine has no exhaust cam sensor, use intake cam inputs" - field = "Cam sensor bank 1 intake", camInputs1, { vvtMode1 != 0 } - field = "Cam sensor bank 1 exhaust", camInputs2, { vvtMode2 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 intake", camInputs3, { vvtMode1 != 0 && camInputs1 != 0 } - field = "Cam sensor bank 2 exhaust", camInputs4, { vvtMode2 != 0 && camInputs2 != 0 } + field = "Cam sensor bank 1 intake", camInputs1, { camInputs1 != 0 || (vvtMode1 != 0 ) } + field = "Cam sensor bank 1 exhaust", camInputs2, { camInputs2 != 0 || (vvtMode2 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 intake", camInputs3, { camInputs3 != 0 || (vvtMode1 != 0 && camInputs1 != 0 ) } + field = "Cam sensor bank 2 exhaust", camInputs4, { camInputs4 != 0 || (vvtMode2 != 0 && camInputs2 != 0 ) } field = "Invert cam inputs", invertCamVVTSignal, { camInputs1 != 0 } @@ -6009,8 +6009,8 @@ dialog = electronic_throttleDialog, "electronic_throttle" field = "GPS TX", gps_tx_pin field = "CAN RX pin", canRxPin field = "CAN TX pin", canTxPin - field = "SPI1 MOSI", spi1mosiPin, {is_enabled_spi_1 == 1} - field = "SPI1 MISO", spi1misoPin, {is_enabled_spi_1 == 1} + field = "SPI1 MOSI", spi1mosiPin, { spi1mosiPin != 0 || is_enabled_spi_1 == 1} + field = "SPI1 MISO", spi1misoPin, { spi1misoPin != 0 || is_enabled_spi_1 == 1} field = "SPI1 SCK", spi1sckPin, {is_enabled_spi_1 == 1} field = "SPI2 MOSI", spi2mosiPin, {is_enabled_spi_2 == 1} field = "SPI2 MISO", spi2misoPin, {is_enabled_spi_2 == 1} @@ -6665,7 +6665,7 @@ dialog = electronic_throttleDialog, "electronic_throttle" dialog = startStopDialog, "Start/Stop Button" field = "Start/Stop Button Pin", startStopButtonPin field = "Start/Stop Button Mode", startStopButtonMode - field = "Starter Control", starterControlPin, {startStopButtonPin != 0} + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} dialog = energySystems, "Battery and Alternator Settings", yAxis @@ -7042,7 +7042,7 @@ dialog = tcuControls, "Transmission Settings" dialog = boostDialog, "" field = "Enable", isBoostControlEnabled field = "Control Mode", boostType, { isBoostControlEnabled } - field = "Output", boostControlPin, { isBoostControlEnabled } + field = "Output", boostControlPin, { boostControlPin != 0 || isBoostControlEnabled } field = "Output Mode", boostControlPinMode, { isBoostControlEnabled } field = "Frequency", boostPwmFrequency, { isBoostControlEnabled } field = "Safe duty cycle", boostControlSafeDutyCycle, { isBoostControlEnabled } @@ -7291,7 +7291,7 @@ dialog = tcuControls, "Transmission Settings" field = "Enable Launch Control", launchControlEnabled field = "Activation Mode", launchActivationMode - field = "Launch Button", launchActivatePin, {launchActivationMode == 0 && launchControlEnabled == 1} + field = "Launch Button", launchActivatePin, { launchActivatePin != 0 || (launchActivationMode == 0 && launchControlEnabled == 1)} field = "Launch Button inverted", launchActivateInverted field = "Launch Button mode", launchActivatePinMode, {launchActivationMode == 0 && launchControlEnabled == 1} @@ -7329,7 +7329,7 @@ dialog = tcuControls, "Transmission Settings" dialog = antiLag, "AntiLag Settings NOT WORKING" field = "Enable AntiLag", antiLagEnabled field = "Activation Mode", antiLagActivationMode, {antiLagEnabled == 1} - field = "Switch Input", antiLagActivatePin, {antiLagActivationMode == 1 && antiLagEnabled == 1} + field = "Switch Input", antiLagActivatePin, {antiLagActivatePin != 0 || ( antiLagActivationMode == 1 && antiLagEnabled == 1 ) } dialog = coastingFuelCutControl, "Coasting Fuel Cutoff Settings" 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 6d9114b10c..de98c6dca4 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 Wed May 25 00:09:33 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu May 26 01:55:24 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1871,7 +1871,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2066; public static final int servoOutputPins8_offset = 2068; public static final int showHumanReadableWarning_offset = 940; - public static final int SIGNATURE_HASH = 252800773; + public static final int SIGNATURE_HASH = 1676529046; public static final int silentTriggerError_offset = 1340; public static final int skippedWheelOnCam_offset = 1340; public static final int slowAdcAlpha_offset = 1580; @@ -2393,7 +2393,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.05.25.all.252800773"; + public static final String TS_SIGNATURE = "rusEFI 2022.05.26.all.1676529046"; 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 = 1016;