From bf08cc5c0bab6ba1351cc9f252f620e21b896174 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sun, 3 Apr 2022 18:13:01 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 7 +++-- .../controllers/algo/rusefi_generated.h | 7 +++-- .../controllers/algo/rusefi_generated.h | 7 +++-- .../controllers/generated/rusefi_generated.h | 7 +++-- .../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_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_harley81.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 | 29 ++++++++++--------- .../generated/rusefi_alphax-2chan.ini | 29 ++++++++++--------- .../generated/rusefi_alphax-4chan.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 29 ++++++++++--------- .../generated/rusefi_f429-discovery.ini | 29 ++++++++++--------- .../generated/rusefi_frankenso_na6.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 29 ++++++++++--------- .../generated/rusefi_hellen-nb1.ini | 29 ++++++++++--------- .../generated/rusefi_hellen121nissan.ini | 29 ++++++++++--------- .../generated/rusefi_hellen121vag.ini | 29 ++++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 29 ++++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 29 ++++++++++--------- .../generated/rusefi_hellen88bmw.ini | 29 ++++++++++--------- .../generated/rusefi_hellenNA6.ini | 29 ++++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 29 ++++++++++--------- .../generated/rusefi_hellen_cypress.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_kinetis.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 29 ++++++++++--------- .../generated/rusefi_prometheus_405.ini | 29 ++++++++++--------- .../generated/rusefi_prometheus_469.ini | 29 ++++++++++--------- .../generated/rusefi_proteus_f4.ini | 29 ++++++++++--------- .../generated/rusefi_proteus_f7.ini | 29 ++++++++++--------- .../generated/rusefi_proteus_h7.ini | 29 ++++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 29 ++++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 29 ++++++++++--------- .../com/rusefi/config/generated/Fields.java | 5 ++-- 63 files changed, 545 insertions(+), 445 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 dc446da8bd..aaff8aebba 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 @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2437077794 +#define SIGNATURE_HASH 1463549721 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2179,6 +2179,7 @@ #define trailingSparkAngle_offset 528 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 16 +#define TRIGGER_CRANK_BASED trigger_type == 5 || trigger_type == 10 || trigger_type == 20 || trigger_type == 23 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 #define trigger_customSkippedToothCount_offset 544 #define trigger_customTotalToothCount_offset 540 #define trigger_event_e_SHAFT_3RD_FALLING 4 @@ -2275,6 +2276,8 @@ #define trigger_type_e_TT_VVT_NISSAN_VQ35 59 #define trigger_type_e_TT_VVT_TOYOTA_4_1 73 #define trigger_type_offset 532 +#define TRIGGER_TYPE_WITH_SECOND_WHEEL 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 == 38 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64 +#define TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 #define trigger_unusedBit_4_10_offset 536 #define trigger_unusedBit_4_11_offset 536 #define trigger_unusedBit_4_12_offset 536 @@ -2480,7 +2483,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen_cypress.2437077794" +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen_cypress.1463549721" #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 0046e019a7..8739ffc271 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1923,7 +1923,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 1860638686 +#define SIGNATURE_HASH 2828940261 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2164,6 +2164,7 @@ #define trailingSparkAngle_offset 528 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 16 +#define TRIGGER_CRANK_BASED trigger_type == 5 || trigger_type == 10 || trigger_type == 20 || trigger_type == 23 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 #define trigger_customSkippedToothCount_offset 544 #define trigger_customTotalToothCount_offset 540 #define trigger_event_e_SHAFT_3RD_FALLING 4 @@ -2260,6 +2261,8 @@ #define trigger_type_e_TT_VVT_NISSAN_VQ35 59 #define trigger_type_e_TT_VVT_TOYOTA_4_1 73 #define trigger_type_offset 532 +#define TRIGGER_TYPE_WITH_SECOND_WHEEL 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 == 38 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64 +#define TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 #define trigger_unusedBit_4_10_offset 536 #define trigger_unusedBit_4_11_offset 536 #define trigger_unusedBit_4_12_offset 536 @@ -2465,7 +2468,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.03.kin.1860638686" +#define TS_SIGNATURE "rusEFI 2022.04.03.kin.2828940261" #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 c0f96b77c4..ec049e9848 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 @@ -1917,7 +1917,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 3389021471 +#define SIGNATURE_HASH 209287460 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2158,6 +2158,7 @@ #define trailingSparkAngle_offset 528 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 16 +#define TRIGGER_CRANK_BASED trigger_type == 5 || trigger_type == 10 || trigger_type == 20 || trigger_type == 23 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 #define trigger_customSkippedToothCount_offset 544 #define trigger_customTotalToothCount_offset 540 #define trigger_event_e_SHAFT_3RD_FALLING 4 @@ -2254,6 +2255,8 @@ #define trigger_type_e_TT_VVT_NISSAN_VQ35 59 #define trigger_type_e_TT_VVT_TOYOTA_4_1 73 #define trigger_type_offset 532 +#define TRIGGER_TYPE_WITH_SECOND_WHEEL 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 == 38 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64 +#define TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 #define trigger_unusedBit_4_10_offset 536 #define trigger_unusedBit_4_11_offset 536 #define trigger_unusedBit_4_12_offset 536 @@ -2459,7 +2462,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.03.subaru_eg33_f7.3389021471" +#define TS_SIGNATURE "rusEFI 2022.04.03.subaru_eg33_f7.209287460" #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 be7e7aed73..bde548659e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1938,7 +1938,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2880912542 +#define SIGNATURE_HASH 1842223269 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2179,6 +2179,7 @@ #define trailingSparkAngle_offset 528 #define TRIGGER_COMMENT "#" #define trigger_config_s_size 16 +#define TRIGGER_CRANK_BASED trigger_type == 5 || trigger_type == 10 || trigger_type == 20 || trigger_type == 23 || trigger_type == 26 || trigger_type == 27 || trigger_type == 39 || trigger_type == 46 || trigger_type == 53 || trigger_type == 55 || trigger_type == 57 || trigger_type == 62 || trigger_type == 70 || trigger_type == 71 #define trigger_customSkippedToothCount_offset 544 #define trigger_customTotalToothCount_offset 540 #define trigger_event_e_SHAFT_3RD_FALLING 4 @@ -2275,6 +2276,8 @@ #define trigger_type_e_TT_VVT_NISSAN_VQ35 59 #define trigger_type_e_TT_VVT_TOYOTA_4_1 73 #define trigger_type_offset 532 +#define TRIGGER_TYPE_WITH_SECOND_WHEEL 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 == 38 || trigger_type == 40 || trigger_type == 49 || trigger_type == 50 || trigger_type == 53 || trigger_type == 54 || trigger_type == 63 || trigger_type == 64 +#define TRIGGER_TYPE_WITHOUT_KNOWN_LOCATION trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69 #define trigger_unusedBit_4_10_offset 536 #define trigger_unusedBit_4_11_offset 536 #define trigger_unusedBit_4_12_offset 536 @@ -2480,7 +2483,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.03.all.2880912542" +#define TS_SIGNATURE "rusEFI 2022.04.03.all.1842223269" #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 92851b1420..56279a5a27 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 2880912542 -#define TS_SIGNATURE "rusEFI 2022.04.03.all.2880912542" +#define SIGNATURE_HASH 1842223269 +#define TS_SIGNATURE "rusEFI 2022.04.03.all.1842223269" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index bcbaa6cefe..cc041c3c2e 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 3063210433 -#define TS_SIGNATURE "rusEFI 2022.04.03.alphax-2chan.3063210433" +#define SIGNATURE_HASH 1894630906 +#define TS_SIGNATURE "rusEFI 2022.04.03.alphax-2chan.1894630906" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index a131d8d6a7..95db32004e 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 570745706 -#define TS_SIGNATURE "rusEFI 2022.04.03.alphax-4chan.570745706" +#define SIGNATURE_HASH 3833448273 +#define TS_SIGNATURE "rusEFI 2022.04.03.alphax-4chan.3833448273" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 3d6193f8a3..21935643a0 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 3078474169 -#define TS_SIGNATURE "rusEFI 2022.04.03.atlas.3078474169" +#define SIGNATURE_HASH 1896148354 +#define TS_SIGNATURE "rusEFI 2022.04.03.atlas.1896148354" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 6a14d53cd6..5a5ac92a5c 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 2257106420 -#define TS_SIGNATURE "rusEFI 2022.04.03.core8.2257106420" +#define SIGNATURE_HASH 1089573327 +#define TS_SIGNATURE "rusEFI 2022.04.03.core8.1089573327" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 4bdb39516c..914ade6736 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 2880912542 -#define TS_SIGNATURE "rusEFI 2022.04.03.f429-discovery.2880912542" +#define SIGNATURE_HASH 1842223269 +#define TS_SIGNATURE "rusEFI 2022.04.03.f429-discovery.1842223269" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 296eb5bac1..12bbed351f 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 3262031023 -#define TS_SIGNATURE "rusEFI 2022.04.03.frankenso_na6.3262031023" +#define SIGNATURE_HASH 68649108 +#define TS_SIGNATURE "rusEFI 2022.04.03.frankenso_na6.68649108" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 24e89fdff9..3575e45240 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 504624241 -#define TS_SIGNATURE "rusEFI 2022.04.03.harley81.504624241" +#define SIGNATURE_HASH 3630878794 +#define TS_SIGNATURE "rusEFI 2022.04.03.harley81.3630878794" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index d2ab383e93..1dfc3e9060 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 2321506515 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen-nb1.2321506515" +#define SIGNATURE_HASH 1277576424 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen-nb1.1277576424" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index ebfa4dff69..ea62b83cee 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 2483581333 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen121nissan.2483581333" +#define SIGNATURE_HASH 1383159214 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen121nissan.1383159214" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index f09406f3e8..398d84a793 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 3317737983 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen121vag.3317737983" +#define SIGNATURE_HASH 62492100 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen121vag.62492100" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 9b993ed951..7591f74cad 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 3039115763 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen128.3039115763" +#define SIGNATURE_HASH 1935416776 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen128.1935416776" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ef3d441156..4c3e0200fe 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 3297804701 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen154hyundai.3297804701" +#define SIGNATURE_HASH 48866726 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen154hyundai.48866726" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 361093d8bd..97fbafa775 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 1692323458 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen72.1692323458" +#define SIGNATURE_HASH 2728913593 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen72.2728913593" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 7ace191e63..582a37b66f 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 1878054645 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen81.1878054645" +#define SIGNATURE_HASH 2844390094 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen81.2844390094" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 5481bbea2a..b591a081b4 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 2750076355 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen88bmw.2750076355" +#define SIGNATURE_HASH 1704194552 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen88bmw.1704194552" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 5a0776c4b2..c8636a264c 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 3185831488 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellenNA6.3185831488" +#define SIGNATURE_HASH 2073741947 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellenNA6.2073741947" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 62b460b28f..0ad47b547c 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 2121650843 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellenNA8_96.2121650843" +#define SIGNATURE_HASH 3087857312 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellenNA8_96.3087857312" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index c074da458c..a63782f620 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 2437077794 -#define TS_SIGNATURE "rusEFI 2022.04.03.hellen_cypress.2437077794" +#define SIGNATURE_HASH 1463549721 +#define TS_SIGNATURE "rusEFI 2022.04.03.hellen_cypress.1463549721" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index f51391b9ab..46cbf7155e 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 1860638686 -#define TS_SIGNATURE "rusEFI 2022.04.03.kin.1860638686" +#define SIGNATURE_HASH 2828940261 +#define TS_SIGNATURE "rusEFI 2022.04.03.kin.2828940261" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 962a7fdac7..caee554d08 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 3298292469 -#define TS_SIGNATURE "rusEFI 2022.04.03.mre_f4.3298292469" +#define SIGNATURE_HASH 49206990 +#define TS_SIGNATURE "rusEFI 2022.04.03.mre_f4.49206990" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e64d191f64..3e088c0950 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 3298292469 -#define TS_SIGNATURE "rusEFI 2022.04.03.mre_f7.3298292469" +#define SIGNATURE_HASH 49206990 +#define TS_SIGNATURE "rusEFI 2022.04.03.mre_f7.49206990" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 41bd772749..0868e6c8c8 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 4217234808 -#define TS_SIGNATURE "rusEFI 2022.04.03.prometheus_405.4217234808" +#define SIGNATURE_HASH 1025818947 +#define TS_SIGNATURE "rusEFI 2022.04.03.prometheus_405.1025818947" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 06edf1e4dc..d3e48b5b07 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 4217234808 -#define TS_SIGNATURE "rusEFI 2022.04.03.prometheus_469.4217234808" +#define SIGNATURE_HASH 1025818947 +#define TS_SIGNATURE "rusEFI 2022.04.03.prometheus_469.1025818947" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index d283f2743d..17e6665775 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 2372838687 -#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_f4.2372838687" +#define SIGNATURE_HASH 1259831588 +#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_f4.1259831588" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 69d0f8b88a..3dbf16e72a 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 2372838687 -#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_f7.2372838687" +#define SIGNATURE_HASH 1259831588 +#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_f7.1259831588" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 9580a340b3..0dab9a06d5 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 2372838687 -#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_h7.2372838687" +#define SIGNATURE_HASH 1259831588 +#define TS_SIGNATURE "rusEFI 2022.04.03.proteus_h7.1259831588" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index cc127c0319..d0ab19dfea 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_config.sh null // -#define SIGNATURE_HASH 3389021471 -#define TS_SIGNATURE "rusEFI 2022.04.03.subaru_eg33_f7.3389021471" +#define SIGNATURE_HASH 209287460 +#define TS_SIGNATURE "rusEFI 2022.04.03.subaru_eg33_f7.209287460" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a2b6fce458..07cc2866a0 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 1202091215 -#define TS_SIGNATURE "rusEFI 2022.04.03.tdg-pdm8.1202091215" +#define SIGNATURE_HASH 2178896116 +#define TS_SIGNATURE "rusEFI 2022.04.03.tdg-pdm8.2178896116" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 7839f864f7..b606279714 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.04.03.all.2880912542" + signature = "rusEFI 2022.04.03.all.1842223269" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.all.2880912542" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.all.1842223269" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:46 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 4662e32c39..6386538b76 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.04.03.alphax-2chan.3063210433" + signature = "rusEFI 2022.04.03.alphax-2chan.1894630906" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.alphax-2chan.3063210433" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.alphax-2chan.1894630906" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:07 UTC 2022 pageSize = 21012 page = 1 @@ -4405,15 +4405,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4453,11 +4450,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4468,8 +4470,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c606b33171..f7acc0e555 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.04.03.alphax-4chan.570745706" + signature = "rusEFI 2022.04.03.alphax-4chan.3833448273" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.alphax-4chan.570745706" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.alphax-4chan.3833448273" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 14:19:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:08 UTC 2022 pageSize = 21012 page = 1 @@ -4406,15 +4406,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4454,11 +4451,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4469,8 +4471,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 26318069a8..45cd2675fb 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.04.03.atlas.3078474169" + signature = "rusEFI 2022.04.03.atlas.1896148354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.atlas.3078474169" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.atlas.1896148354" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:43 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index f8b5adf732..d0cb2d5135 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.04.03.core8.2257106420" + signature = "rusEFI 2022.04.03.core8.1089573327" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.core8.2257106420" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.core8.1089573327" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:31 UTC 2022 pageSize = 21012 page = 1 @@ -4408,15 +4408,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4456,11 +4453,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4471,8 +4473,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 50c219a3fe..2e12777791 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.04.03.f429-discovery.2880912542" + signature = "rusEFI 2022.04.03.f429-discovery.1842223269" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.f429-discovery.2880912542" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.f429-discovery.1842223269" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:42 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 8cea7596eb..e21baf597b 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.04.03.frankenso_na6.3262031023" + signature = "rusEFI 2022.04.03.frankenso_na6.68649108" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.frankenso_na6.3262031023" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.frankenso_na6.68649108" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:32 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 7c636c0570..204cd767ee 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.04.03.harley81.504624241" + signature = "rusEFI 2022.04.03.harley81.3630878794" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.harley81.504624241" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.harley81.3630878794" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:10 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index aff052b2bf..c0d1b834ae 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.04.03.hellen-nb1.2321506515" + signature = "rusEFI 2022.04.03.hellen-nb1.1277576424" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen-nb1.2321506515" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen-nb1.1277576424" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:23 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 9070301587..db2a423454 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.04.03.hellen121nissan.2483581333" + signature = "rusEFI 2022.04.03.hellen121nissan.1383159214" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen121nissan.2483581333" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen121nissan.1383159214" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:15 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 344dbe114b..0f9985f032 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.04.03.hellen121vag.3317737983" + signature = "rusEFI 2022.04.03.hellen121vag.62492100" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen121vag.3317737983" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen121vag.62492100" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:13 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index cd3a38a1c2..d1ccccfcab 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.04.03.hellen128.3039115763" + signature = "rusEFI 2022.04.03.hellen128.1935416776" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen128.3039115763" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen128.1935416776" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:12 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index d16c9cb06c..d434d1ab4e 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.04.03.hellen154hyundai.3297804701" + signature = "rusEFI 2022.04.03.hellen154hyundai.48866726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen154hyundai.3297804701" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen154hyundai.48866726" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:16 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 395cea0c77..be62d06e6c 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.04.03.hellen72.1692323458" + signature = "rusEFI 2022.04.03.hellen72.2728913593" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen72.1692323458" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen72.2728913593" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:19 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 1c46821da3..ffe7f9e4e9 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.04.03.hellen81.1878054645" + signature = "rusEFI 2022.04.03.hellen81.2844390094" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen81.1878054645" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen81.2844390094" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:21 UTC 2022 pageSize = 21012 page = 1 @@ -4406,15 +4406,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4454,11 +4451,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4469,8 +4471,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 49eb8ce1f4..b7daf34315 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.04.03.hellen88bmw.2750076355" + signature = "rusEFI 2022.04.03.hellen88bmw.1704194552" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen88bmw.2750076355" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen88bmw.1704194552" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:18 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index c890534f25..07af6ed808 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.04.03.hellenNA6.3185831488" + signature = "rusEFI 2022.04.03.hellenNA6.2073741947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellenNA6.3185831488" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellenNA6.2073741947" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:34:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:24 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 3548096a0c..472a1a8a76 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.04.03.hellenNA8_96.2121650843" + signature = "rusEFI 2022.04.03.hellenNA8_96.3087857312" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellenNA8_96.2121650843" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellenNA8_96.3087857312" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:26 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 12976a9495..4c15c07523 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.04.03.hellen_cypress.2437077794" + signature = "rusEFI 2022.04.03.hellen_cypress.1463549721" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.hellen_cypress.2437077794" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.hellen_cypress.1463549721" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:49 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 3467649ad5..c19e41a188 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.04.03.kin.1860638686" + signature = "rusEFI 2022.04.03.kin.2828940261" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.kin.1860638686" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.kin.2828940261" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:48 UTC 2022 pageSize = 20984 page = 1 @@ -4377,15 +4377,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4425,11 +4422,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4441,8 +4443,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index ae74592e4d..43505475a7 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.04.03.mre_f4.3298292469" + signature = "rusEFI 2022.04.03.mre_f4.49206990" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.mre_f4.3298292469" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.mre_f4.49206990" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:29 UTC 2022 pageSize = 21012 page = 1 @@ -4408,15 +4408,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4456,11 +4453,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4471,8 +4473,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index d33b8ac110..854475646d 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.04.03.mre_f7.3298292469" + signature = "rusEFI 2022.04.03.mre_f7.49206990" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.mre_f7.3298292469" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.mre_f7.49206990" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:27 UTC 2022 pageSize = 21012 page = 1 @@ -4408,15 +4408,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4456,11 +4453,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4471,8 +4473,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 383c4efdbb..ab7c160163 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.04.03.prometheus_405.4217234808" + signature = "rusEFI 2022.04.03.prometheus_405.1025818947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.prometheus_405.4217234808" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.prometheus_405.1025818947" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:35 UTC 2022 pageSize = 21012 page = 1 @@ -4406,15 +4406,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4454,11 +4451,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4469,8 +4471,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b374872f70..f60162f997 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.04.03.prometheus_469.4217234808" + signature = "rusEFI 2022.04.03.prometheus_469.1025818947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.prometheus_469.4217234808" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.prometheus_469.1025818947" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:34 UTC 2022 pageSize = 21012 page = 1 @@ -4406,15 +4406,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4454,11 +4451,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4469,8 +4471,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8359524418..9953591e92 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.04.03.proteus_f4.2372838687" + signature = "rusEFI 2022.04.03.proteus_f4.1259831588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.proteus_f4.2372838687" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.proteus_f4.1259831588" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:39 UTC 2022 pageSize = 21012 page = 1 @@ -4404,15 +4404,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4452,11 +4449,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4467,8 +4469,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 2c73f25697..2a0f739acc 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.04.03.proteus_f7.2372838687" + signature = "rusEFI 2022.04.03.proteus_f7.1259831588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.proteus_f7.2372838687" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.proteus_f7.1259831588" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:37 UTC 2022 pageSize = 21012 page = 1 @@ -4404,15 +4404,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4452,11 +4449,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4467,8 +4469,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 5f5a8d695c..d9c89255f1 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.04.03.proteus_h7.2372838687" + signature = "rusEFI 2022.04.03.proteus_h7.1259831588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.proteus_h7.2372838687" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.proteus_h7.1259831588" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:40 UTC 2022 pageSize = 21012 page = 1 @@ -4404,15 +4404,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4452,11 +4449,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4467,8 +4469,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index ada90f2adc..d035d45864 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.04.03.subaru_eg33_f7.3389021471" + signature = "rusEFI 2022.04.03.subaru_eg33_f7.209287460" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.subaru_eg33_f7.3389021471" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.subaru_eg33_f7.209287460" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:51 UTC 2022 pageSize = 21012 page = 1 @@ -4407,15 +4407,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4455,11 +4452,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4470,8 +4472,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 5e37f6f14e..c2f29cc040 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.04.03.tdg-pdm8.1202091215" + signature = "rusEFI 2022.04.03.tdg-pdm8.2178896116" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.03.tdg-pdm8.1202091215" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.03.tdg-pdm8.2178896116" ; 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 @@ -84,7 +84,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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:45 UTC 2022 pageSize = 21012 page = 1 @@ -4411,15 +4411,12 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "What kind of engine", twoStroke - field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 } - field = "#Please use '4 stroke with cam' only if primary trigger sensor is actually on cam" - field = "#Separate cam input not part of Trigger Pattern does not count here" + field = "Skipped wheel location", skippedWheelOnCam, { twoStroke == 0 && (trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) } field = "With VR sensors only rising edge has reliable position" field = "use only rising edge", useOnlyRisingEdgeForTrigger field = "!Reminder that 4-stroke cycle is 720 degrees" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Advance", globalTriggerAngleOffset - field = "Display logic signals", displayLogicLevelsInEngineSniffer dialog = triggerConfiguration_gap, "Trigger Gap Override" field = "!This is a pretty advanced feature for when you are debugging trigger synchronization" @@ -4459,11 +4456,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerInputs, "Trigger Inputs" field = "#Cam is primary if you have cam sensor as part of trigger shape" - field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode == 2 } - field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { ambiguousOperationMode != 2 } + ; cam if + ; two-stroke, or + ; trigger without known location and cam selected, or + ; ! trigger is crank based + field = "Cam Sensor (Primary channel)", triggerInputPins1, 1, { twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED) } + field = "Crank Sensor (Primary channel)", triggerInputPins1, 1, { !(twoStroke == 1 || ((trigger_type == 8 || trigger_type == 9 || trigger_type == 17 || trigger_type == 18 || trigger_type == 23 || trigger_type == 48 || trigger_type == 69) && skippedWheelOnCam) || ! (@@TRIGGER_CRANK_BASED)) } + field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} - field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20 && trigger_type != 48} + field = "Secondary channel", triggerInputPins2, { triggerInputPins1 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } + field = "Invert Secondary", invertSecondaryTriggerSignal, { triggerInputPins2 != 0 && (@@TRIGGER_TYPE_WITH_SECOND_WHEEL)) } 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 } @@ -4474,8 +4476,9 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = triggerConfiguration - panel = triggerConfiguration_settings, North, { consumeObdSensors == 0 } - panel = triggerInputs, South, { consumeObdSensors == 0 } + panel = triggerConfiguration_settings, {1}, { consumeObdSensors == 0 } + panel = triggerInputs, {1}, { consumeObdSensors == 0 } + field = "Display logic signals", displayLogicLevelsInEngineSniffer ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis 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 f449153981..349b96459e 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 (unknown script) integration/rusefi_config.txt Sun Apr 03 13:35:25 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) integration/rusefi_config.txt Sun Apr 03 18:10:52 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1867,6 +1867,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; + public static final int SIGNATURE_HASH = 1842223269; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2351,7 +2352,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.04.03.all.2880912542"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.03.all.1842223269"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TsCalMode_EtbKd = 5;