From fac0a85ff819f6d29dfdf1ae123f8c78d8735df7 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Sun, 13 Nov 2022 22:05:51 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/algo/rusefi_generated.h | 4 +- .../controllers/generated/rusefi_generated.h | 4 +- .../controllers/generated/signature_48way.h | 4 +- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../controllers/generated/signature_core8.h | 4 +- .../controllers/generated/signature_cypress.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_harley81.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_48way.ini | 87 ++++++++++--------- .../generated/rusefi_alphax-2chan.ini | 87 ++++++++++--------- .../generated/rusefi_alphax-4chan.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_core8.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_cypress.ini | 87 ++++++++++--------- .../generated/rusefi_f407-discovery.ini | 87 ++++++++++--------- .../generated/rusefi_f429-discovery.ini | 87 ++++++++++--------- .../generated/rusefi_frankenso_na6.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_harley81.ini | 87 ++++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 87 ++++++++++--------- .../generated/rusefi_hellen-nb1.ini | 87 ++++++++++--------- .../generated/rusefi_hellen121nissan.ini | 87 ++++++++++--------- .../generated/rusefi_hellen121vag.ini | 87 ++++++++++--------- .../generated/rusefi_hellen128mercedes.ini | 87 ++++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 87 ++++++++++--------- .../generated/rusefi_hellen88bmw.ini | 87 ++++++++++--------- .../generated/rusefi_hellenNA6.ini | 87 ++++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 87 ++++++++++--------- firmware/tunerstudio/generated/rusefi_kin.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 87 ++++++++++--------- .../generated/rusefi_prometheus_405.ini | 87 ++++++++++--------- .../generated/rusefi_prometheus_469.ini | 87 ++++++++++--------- .../generated/rusefi_proteus_f4.ini | 87 ++++++++++--------- .../generated/rusefi_proteus_f7.ini | 87 ++++++++++--------- .../generated/rusefi_proteus_h7.ini | 87 ++++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 87 ++++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 87 ++++++++++--------- .../com/rusefi/config/generated/Fields.java | 4 +- 69 files changed, 1482 insertions(+), 1450 deletions(-) diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index fcb254598b..1f806e8edf 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_36958 +#define SIGNATURE_HASH snap_57724 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.11.13.cypress.snap_36958" +#define TS_SIGNATURE "rusEFI 2022.11.13.cypress.snap_57724" #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 02c1036745..39c6c1c728 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_12946 +#define SIGNATURE_HASH snap_17328 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.11.13.kin.snap_12946" +#define TS_SIGNATURE "rusEFI 2022.11.13.kin.snap_17328" #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 fd06f87db9..c6df168651 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 @@ -992,7 +992,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH snap_18820 +#define SIGNATURE_HASH snap_14502 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1265,7 +1265,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.11.13.subaru_eg33_f7.snap_18820" +#define TS_SIGNATURE "rusEFI 2022.11.13.subaru_eg33_f7.snap_14502" #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 dd0c991433..94590ac473 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1026,7 +1026,7 @@ #define SENT_INPUT_COUNT 1 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH snap_36958 +#define SIGNATURE_HASH snap_57724 #define specs_s_size 12 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1298,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.11.13.all.snap_36958" +#define TS_SIGNATURE "rusEFI 2022.11.13.all.snap_57724" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 1245a055bd..627eeec932 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_38929 -#define TS_SIGNATURE "rusEFI 2022.11.13.48way.snap_38929" +#define SIGNATURE_HASH snap_59699 +#define TS_SIGNATURE "rusEFI 2022.11.13.48way.snap_59699" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0637a089b2..4ad1c8e1dd 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 by SignatureConsumer // -#define SIGNATURE_HASH snap_36958 -#define TS_SIGNATURE "rusEFI 2022.11.13.all.snap_36958" +#define SIGNATURE_HASH snap_57724 +#define TS_SIGNATURE "rusEFI 2022.11.13.all.snap_57724" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 83a74bc63b..6b69eefba1 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_3378 -#define TS_SIGNATURE "rusEFI 2022.11.13.alphax-2chan.snap_3378" +#define SIGNATURE_HASH snap_31760 +#define TS_SIGNATURE "rusEFI 2022.11.13.alphax-2chan.snap_31760" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 29b1c0be7a..0977f546c0 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21457 -#define TS_SIGNATURE "rusEFI 2022.11.13.alphax-4chan.snap_21457" +#define SIGNATURE_HASH snap_8947 +#define TS_SIGNATURE "rusEFI 2022.11.13.alphax-4chan.snap_8947" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 56e99fbfc9..0a83a042d0 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_25977 -#define TS_SIGNATURE "rusEFI 2022.11.13.atlas.snap_25977" +#define SIGNATURE_HASH snap_5211 +#define TS_SIGNATURE "rusEFI 2022.11.13.atlas.snap_5211" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 89709d503b..0f157a4b5b 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_49575 -#define TS_SIGNATURE "rusEFI 2022.11.13.core8.snap_49575" +#define SIGNATURE_HASH snap_45189 +#define TS_SIGNATURE "rusEFI 2022.11.13.core8.snap_45189" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index abc065d820..fbc8467371 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_36958 -#define TS_SIGNATURE "rusEFI 2022.11.13.cypress.snap_36958" +#define SIGNATURE_HASH snap_57724 +#define TS_SIGNATURE "rusEFI 2022.11.13.cypress.snap_57724" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 344c284ee8..587d258646 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_36958 -#define TS_SIGNATURE "rusEFI 2022.11.13.f407-discovery.snap_36958" +#define SIGNATURE_HASH snap_57724 +#define TS_SIGNATURE "rusEFI 2022.11.13.f407-discovery.snap_57724" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index c07009e930..bd72e3ceb5 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_36958 -#define TS_SIGNATURE "rusEFI 2022.11.13.f429-discovery.snap_36958" +#define SIGNATURE_HASH snap_57724 +#define TS_SIGNATURE "rusEFI 2022.11.13.f429-discovery.snap_57724" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index fced59585b..e4af1591a5 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_27802 -#define TS_SIGNATURE "rusEFI 2022.11.13.frankenso_na6.snap_27802" +#define SIGNATURE_HASH snap_7608 +#define TS_SIGNATURE "rusEFI 2022.11.13.frankenso_na6.snap_7608" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index e573aec80d..cffe292a8d 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_38257 -#define TS_SIGNATURE "rusEFI 2022.11.13.harley81.snap_38257" +#define SIGNATURE_HASH snap_58451 +#define TS_SIGNATURE "rusEFI 2022.11.13.harley81.snap_58451" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 8288ae280c..536a495241 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_62298 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen-gm-e67.snap_62298" +#define SIGNATURE_HASH snap_33400 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen-gm-e67.snap_33400" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index a58b3d7579..1f6aba0a96 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_41362 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen-nb1.snap_41362" +#define SIGNATURE_HASH snap_53424 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen-nb1.snap_53424" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 3a779051d5..8e76b0625a 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_40226 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen121nissan.snap_40226" +#define SIGNATURE_HASH snap_60416 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen121nissan.snap_60416" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 00033fbe76..5a802ffe18 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_21284 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen121vag.snap_21284" +#define SIGNATURE_HASH snap_8710 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen121vag.snap_8710" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a65e6adb2c..f053da3d3d 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_60773 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen128.snap_60773" +#define SIGNATURE_HASH snap_40007 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen128.snap_40007" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 3289caa9f1..f509ce6073 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_43709 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen154hyundai.snap_43709" +#define SIGNATURE_HASH snap_56223 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen154hyundai.snap_56223" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ec6672bde4..9aa6e92cf2 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_40661 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen72.snap_40661" +#define SIGNATURE_HASH snap_61431 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen72.snap_61431" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 93d4d451fc..b7306a0e0d 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_18516 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen81.snap_18516" +#define SIGNATURE_HASH snap_14710 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen81.snap_14710" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 28e1ea34c0..2e43a9abae 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_33682 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellen88bmw.snap_33682" +#define SIGNATURE_HASH snap_62128 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellen88bmw.snap_62128" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 5932f6e59a..3aaee0241a 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_8553 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellenNA6.snap_8553" +#define SIGNATURE_HASH snap_20555 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellenNA6.snap_20555" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 6e0729e01b..7f681f3f07 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_8630 -#define TS_SIGNATURE "rusEFI 2022.11.13.hellenNA8_96.snap_8630" +#define SIGNATURE_HASH snap_20628 +#define TS_SIGNATURE "rusEFI 2022.11.13.hellenNA8_96.snap_20628" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a9d9b0bc5b..58fda84b63 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH snap_12946 -#define TS_SIGNATURE "rusEFI 2022.11.13.kin.snap_12946" +#define SIGNATURE_HASH snap_17328 +#define TS_SIGNATURE "rusEFI 2022.11.13.kin.snap_17328" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 5373d0b18f..6d37a4e179 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_63326 -#define TS_SIGNATURE "rusEFI 2022.11.13.mre_f4.snap_63326" +#define SIGNATURE_HASH snap_34428 +#define TS_SIGNATURE "rusEFI 2022.11.13.mre_f4.snap_34428" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 6d9183fe5e..ef033f2184 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_63326 -#define TS_SIGNATURE "rusEFI 2022.11.13.mre_f7.snap_63326" +#define SIGNATURE_HASH snap_34428 +#define TS_SIGNATURE "rusEFI 2022.11.13.mre_f7.snap_34428" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 637b7cef15..8fbe8a2a45 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_18872 -#define TS_SIGNATURE "rusEFI 2022.11.13.prometheus_405.snap_18872" +#define SIGNATURE_HASH snap_14490 +#define TS_SIGNATURE "rusEFI 2022.11.13.prometheus_405.snap_14490" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 7710a49cc2..7abac5b1d4 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_18872 -#define TS_SIGNATURE "rusEFI 2022.11.13.prometheus_469.snap_18872" +#define SIGNATURE_HASH snap_14490 +#define TS_SIGNATURE "rusEFI 2022.11.13.prometheus_469.snap_14490" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e0a6e4afd6..330c5242b4 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_22312 -#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_f4.snap_22312" +#define SIGNATURE_HASH snap_9738 +#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_f4.snap_9738" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 1178cd56b5..807808e0bb 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_22312 -#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_f7.snap_22312" +#define SIGNATURE_HASH snap_9738 +#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_f7.snap_9738" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index ba8324c1e7..2e018fcb96 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_22312 -#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_h7.snap_22312" +#define SIGNATURE_HASH snap_9738 +#define TS_SIGNATURE "rusEFI 2022.11.13.proteus_h7.snap_9738" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 621d13d4b0..83af67ff90 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_18820 -#define TS_SIGNATURE "rusEFI 2022.11.13.subaru_eg33_f7.snap_18820" +#define SIGNATURE_HASH snap_14502 +#define TS_SIGNATURE "rusEFI 2022.11.13.subaru_eg33_f7.snap_14502" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index e8ba4443d9..4785fb31f3 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH snap_24074 -#define TS_SIGNATURE "rusEFI 2022.11.13.tdg-pdm8.snap_24074" +#define SIGNATURE_HASH snap_12072 +#define TS_SIGNATURE "rusEFI 2022.11.13.tdg-pdm8.snap_12072" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index e64ce564f2..ea06316609 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.all.snap_36958" + signature = "rusEFI 2022.11.13.all.snap_57724" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.all.snap_36958" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.all.snap_57724" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:33 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 817bbf684d..108e189d61 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.48way.snap_38929" + signature = "rusEFI 2022.11.13.48way.snap_59699" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.48way.snap_38929" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.48way.snap_59699" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:11 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4997,6 +4971,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6643,15 +6640,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6664,11 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6859,12 +6865,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6907,6 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7047,7 +7048,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index d85ba4400a..0e96c4b05b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.alphax-2chan.snap_3378" + signature = "rusEFI 2022.11.13.alphax-2chan.snap_31760" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.alphax-2chan.snap_3378" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.alphax-2chan.snap_31760" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 16:59:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:38 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4993,6 +4967,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6628,15 +6625,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6649,11 +6660,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6844,12 +6850,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6892,6 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7026,7 +7027,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 6ca83de267..9ae3b9d339 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.alphax-4chan.snap_21457" + signature = "rusEFI 2022.11.13.alphax-4chan.snap_8947" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.alphax-4chan.snap_21457" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.alphax-4chan.snap_8947" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 16:59:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:40 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7030,7 +7031,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 83113d123e..1c00dafd68 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.atlas.snap_25977" + signature = "rusEFI 2022.11.13.atlas.snap_5211" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.atlas.snap_25977" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.atlas.snap_5211" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:29 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6639,15 +6636,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6660,11 +6671,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6855,12 +6861,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6903,6 +6903,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7044,7 +7045,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index c4d6e2541c..b813919947 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.core8.snap_49575" + signature = "rusEFI 2022.11.13.core8.snap_45189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.core8.snap_49575" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.core8.snap_45189" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:22 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:09 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4997,6 +4971,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6643,15 +6640,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6664,11 +6675,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6859,12 +6865,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6907,6 +6907,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7047,7 +7048,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index dc5809775c..5b600fed40 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.cypress.snap_36958" + signature = "rusEFI 2022.11.13.cypress.snap_57724" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.cypress.snap_36958" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.cypress.snap_57724" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 13 16:59:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 13 22:04:34 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 973f3fbfc6..db8c19a5bb 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.f407-discovery.snap_36958" + signature = "rusEFI 2022.11.13.f407-discovery.snap_57724" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.f407-discovery.snap_36958" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.f407-discovery.snap_57724" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:35 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:25 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 4d6eebb7fe..4f42ee1a41 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.f429-discovery.snap_36958" + signature = "rusEFI 2022.11.13.f429-discovery.snap_57724" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.f429-discovery.snap_36958" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.f429-discovery.snap_57724" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:27 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index cebf3bd01a..470b4b01ff 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.frankenso_na6.snap_27802" + signature = "rusEFI 2022.11.13.frankenso_na6.snap_7608" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.frankenso_na6.snap_27802" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.frankenso_na6.snap_7608" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:13 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index ceea4bde97..b9ef22d790 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.harley81.snap_38257" + signature = "rusEFI 2022.11.13.harley81.snap_58451" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.harley81.snap_38257" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.harley81.snap_58451" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:42 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6629,15 +6626,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6650,11 +6661,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6845,12 +6851,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7027,7 +7028,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 685d062633..1dec106560 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen-gm-e67.snap_62298" + signature = "rusEFI 2022.11.13.hellen-gm-e67.snap_33400" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen-gm-e67.snap_62298" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen-gm-e67.snap_33400" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:59 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7028,7 +7029,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index bce206bea7..f014f0b5cc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen-nb1.snap_41362" + signature = "rusEFI 2022.11.13.hellen-nb1.snap_53424" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen-nb1.snap_41362" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen-nb1.snap_53424" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:57 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7028,7 +7029,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 02a11ed54c..0a153eb787 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen121nissan.snap_40226" + signature = "rusEFI 2022.11.13.hellen121nissan.snap_60416" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen121nissan.snap_40226" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen121nissan.snap_60416" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:48 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6629,15 +6626,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6650,11 +6661,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6845,12 +6851,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7024,7 +7025,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 341e40b76b..a41fc1ae32 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen121vag.snap_21284" + signature = "rusEFI 2022.11.13.hellen121vag.snap_8710" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen121vag.snap_21284" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen121vag.snap_8710" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:46 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7027,7 +7028,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 34e20a4349..a56d33c974 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen128.snap_60773" + signature = "rusEFI 2022.11.13.hellen128.snap_40007" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen128.snap_60773" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen128.snap_40007" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:44 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6629,15 +6626,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6650,11 +6661,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6845,12 +6851,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7024,7 +7025,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index f544b75802..c146ff2206 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen154hyundai.snap_43709" + signature = "rusEFI 2022.11.13.hellen154hyundai.snap_56223" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen154hyundai.snap_43709" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen154hyundai.snap_56223" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:50 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6629,15 +6626,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6650,11 +6661,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6845,12 +6851,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7024,7 +7025,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 6d4f87b7d7..262511c776 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen72.snap_40661" + signature = "rusEFI 2022.11.13.hellen72.snap_61431" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen72.snap_40661" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen72.snap_61431" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:54 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7028,7 +7029,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index e0155dafed..36737e300c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen81.snap_18516" + signature = "rusEFI 2022.11.13.hellen81.snap_14710" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen81.snap_18516" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen81.snap_14710" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:55 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4994,6 +4968,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6630,15 +6627,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6651,11 +6662,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6846,12 +6852,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6894,6 +6894,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7025,7 +7026,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 2f63da04e1..66782e8ccb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellen88bmw.snap_33682" + signature = "rusEFI 2022.11.13.hellen88bmw.snap_62128" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellen88bmw.snap_33682" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellen88bmw.snap_62128" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:52 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6629,15 +6626,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6650,11 +6661,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6845,12 +6851,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6892,6 +6892,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7023,7 +7024,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 374d9cde27..a9396cd135 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellenNA6.snap_8553" + signature = "rusEFI 2022.11.13.hellenNA6.snap_20555" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellenNA6.snap_8553" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellenNA6.snap_20555" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:01 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7028,7 +7029,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 2019e161ad..b4693dc2cd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.hellenNA8_96.snap_8630" + signature = "rusEFI 2022.11.13.hellenNA8_96.snap_20628" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.hellenNA8_96.snap_8630" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.hellenNA8_96.snap_20628" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:03 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4996,6 +4970,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6632,15 +6629,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6653,11 +6664,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6848,12 +6854,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6896,6 +6896,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7028,7 +7029,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 78a3747d4b..9169301823 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.kin.snap_12946" + signature = "rusEFI 2022.11.13.kin.snap_17328" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.kin.snap_12946" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.kin.snap_17328" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 13 16:59:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 13 22:04:32 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6648,15 +6645,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6669,11 +6680,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6864,12 +6870,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6912,6 +6912,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7053,7 +7054,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9f8ae685de..29dbc68304 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.mre_f4.snap_63326" + signature = "rusEFI 2022.11.13.mre_f4.snap_34428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.mre_f4.snap_63326" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.mre_f4.snap_34428" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:07 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4997,6 +4971,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6630,15 +6627,29 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mainRelayDialog, "Main relay output" field = "microRusEFI main relay control is hard wired on pin #29" - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6651,11 +6662,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6846,12 +6852,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7026,7 +7027,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 5f58f2a86d..cd3d9f2a97 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.mre_f7.snap_63326" + signature = "rusEFI 2022.11.13.mre_f7.snap_34428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.mre_f7.snap_63326" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.mre_f7.snap_34428" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:05 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4997,6 +4971,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6630,15 +6627,29 @@ dialog = wideband_stateDialog, "wideband_state" dialog = mainRelayDialog, "Main relay output" field = "microRusEFI main relay control is hard wired on pin #29" - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6651,11 +6662,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6846,12 +6852,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6893,6 +6893,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7026,7 +7027,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 3d08262d3e..3e9d8f10c1 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.prometheus_405.snap_18872" + signature = "rusEFI 2022.11.13.prometheus_405.snap_14490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.prometheus_405.snap_18872" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.prometheus_405.snap_14490" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:17 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4993,6 +4967,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6641,15 +6638,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6662,11 +6673,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6857,12 +6863,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6905,6 +6905,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7046,7 +7047,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1dc7af2f2c..4a11948249 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.prometheus_469.snap_18872" + signature = "rusEFI 2022.11.13.prometheus_469.snap_14490" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.prometheus_469.snap_18872" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.prometheus_469.snap_14490" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:15 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4993,6 +4967,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6641,15 +6638,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6662,11 +6673,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6857,12 +6863,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6905,6 +6905,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7046,7 +7047,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 074a9ff542..4804a8219a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.proteus_f4.snap_22312" + signature = "rusEFI 2022.11.13.proteus_f4.snap_9738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.proteus_f4.snap_22312" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.proteus_f4.snap_9738" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:21 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4992,6 +4966,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6623,15 +6620,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6644,11 +6655,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6839,12 +6845,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6886,6 +6886,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7015,7 +7016,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 9a95f9f224..8aac380297 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.proteus_f7.snap_22312" + signature = "rusEFI 2022.11.13.proteus_f7.snap_9738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.proteus_f7.snap_22312" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.proteus_f7.snap_9738" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:19 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4992,6 +4966,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6623,15 +6620,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6644,11 +6655,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6839,12 +6845,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6886,6 +6886,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7015,7 +7016,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index aecdce590a..03cf554f7c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.proteus_h7.snap_22312" + signature = "rusEFI 2022.11.13.proteus_h7.snap_9738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.proteus_h7.snap_22312" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.proteus_h7.snap_9738" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:23 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4992,6 +4966,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6623,15 +6620,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6644,11 +6655,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6839,12 +6845,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = alternator @@ -6886,6 +6886,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7015,7 +7016,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 6493f6306d..fd914be596 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.subaru_eg33_f7.snap_18820" + signature = "rusEFI 2022.11.13.subaru_eg33_f7.snap_14502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.subaru_eg33_f7.snap_18820" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.subaru_eg33_f7.snap_14502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sun Nov 13 16:59:55 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sun Nov 13 22:04:36 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4995,6 +4969,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6641,15 +6638,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6662,11 +6673,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6857,12 +6863,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6905,6 +6905,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7041,7 +7042,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 1ae4e13b2c..61bf9e2184 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.11.13.tdg-pdm8.snap_24074" + signature = "rusEFI 2022.11.13.tdg-pdm8.snap_12072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI 2022.11.13.tdg-pdm8.snap_24074" ; signature is expected to be 7 or more characters. + signature= "rusEFI 2022.11.13.tdg-pdm8.snap_12072" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:31 UTC 2022 pageSize = 22800 page = 1 @@ -4683,9 +4683,7 @@ menuDialog = main # Digital outputs subMenu = outputsDialog, "Outputs" - subMenu = mainRelayDialog, "Main relay" subMenu = acSettings, "Air Conditioning" - subMenu = malfunction, "Check engine light" subMenu = statusLeds, "Status LEDs" menu = "Fuel" @@ -4820,32 +4818,8 @@ menuDialog = main subMenu = idleVeTableTbl, "Idle VE", 0, {useSeparateVeForIdle == 1} subMenu = idleAdvanceCurve, "Ignition advance", 0, {useSeparateAdvanceForIdle == 1} - menu = "&View" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - - menu = "&Advanced" subMenu = ignitionCylExtra, "Cylinder offsets", 0 - subMenu = gearDetection, "Gear detection", 0 subMenu = std_separator subMenu = boostDialog, "Boost control" @@ -4999,6 +4973,29 @@ menuDialog = main menu = "Help" subMenu = helpGeneral, "rusEFI Info" + menu = "&View" + subMenu = knock_controllerDialog, "knock_controller" + subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" + subMenu = injector_modelDialog, "injector_model" + subMenu = fuel_computerDialog, "fuel_computer" + subMenu = launch_control_stateDialog, "launch_control_state" + subMenu = boost_controlDialog, "boost_control" + subMenu = ac_controlDialog, "ac_control" + subMenu = fan_controlDialog, "fan_control" + subMenu = fuel_pump_controlDialog, "fuel_pump_control" + subMenu = main_relayDialog, "main_relay" + subMenu = engine_stateDialog, "engine_state" + subMenu = tps_accel_stateDialog, "tps_accel_state" + subMenu = trigger_centralDialog, "trigger_central" + subMenu = trigger_stateDialog, "trigger_state" + subMenu = trigger_state_primaryDialog, "trigger_state_primary" + subMenu = wall_fuel_stateDialog, "wall_fuel_state" + subMenu = idle_stateDialog, "idle_state" + subMenu = ignition_stateDialog, "ignition_state" + subMenu = electronic_throttleDialog, "electronic_throttle" + subMenu = wideband_stateDialog, "wideband_state" + + [ControllerCommands] ; commandName = command1, command2, commandn... @@ -6647,15 +6644,29 @@ dialog = wideband_stateDialog, "wideband_state" field = "Output", mainRelayPin field = "Output mode", mainRelayPinMode - dialog = starterRelay, "Starter relay output" + dialog = starterRelayDialog, "Starter Disable" field = "Output", starterRelayDisablePin field = "Output mode", starterRelayDisablePinMode + dialog = startStopDialog, "Starter Control" + field = "Start/Stop Button input", startStopButtonPin + field = "Start/Stop Button input mode", startStopButtonMode + field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} + field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} + +; Engine->MIL Settings + dialog = malfunctionDialog, "Check Engine Settings" + field = "Output", malfunctionIndicatorPin + field = "Output mode", malfunctionIndicatorPinMode + field = "Warning Period", warningPeriod + dialog = outputsDialogLeft + panel = mainRelayDialog panel = fuelPumpDialog panel = tachSettings panel = startStopDialog - panel = starterRelay + panel = starterRelayDialog + panel = malfunctionDialog dialog = outputsDialog, "Outputs", border panel = outputsDialogLeft, West @@ -6668,11 +6679,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Trigger error LED", triggerErrorPin field = "Debug Trigger Sync", debugTriggerSync -; Engine->MIL Settings - dialog = malfunction, "Check Engine Settings" - field = "Output", malfunctionIndicatorPin - field = "Output mode", malfunctionIndicatorPinMode - field = "Warning Period", warningPeriod dialog = softwareKnockCfg, "Sense" field = "Enable", enableSoftwareKnock @@ -6863,12 +6869,6 @@ dialog = wideband_stateDialog, "wideband_state" field = "Max", alternatorControl_maxValue, {isAlternatorControlEnabled == 1} field = "#% duty = Pterm + Iterm + Dterm + offset%" - dialog = startStopDialog, "Start/Stop Button" - field = "Start/Stop Button input", startStopButtonPin - field = "Start/Stop Button input mode", startStopButtonMode - field = "Starter Control", starterControlPin, { starterControlPin != 0 || startStopButtonPin != 0} - field = "Start cranking maximum time", startCrankingDuration, {startStopButtonPin != 0} - dialog = energySystems, "Battery and Alternator Settings", yAxis panel = batteryDialog panel = alternator @@ -6911,6 +6911,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = speedSensor, "Speed sensor", xAxis panel = speedSensorLeft gauge = VSSGauge + panel = gearDetection ; Engine->Other inputs dialog = analogInputSettings, "Analog Input Settings" @@ -7052,7 +7053,7 @@ dialog = wideband_stateDialog, "wideband_state" dialog = limitsAndFallback, "Limits and fallbacks", border panel = limitsAndFallbackLeft, West - panel = limitsAndFallbackCenter, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } + panel = limitsAndFallbackCenter, Center, { (cutFuelOnHardLimit || cutSparkOnHardLimit) && useCltBasedRpmLimit } ; Engine->Base Engine Settings dialog = engineChars, "Base Engine Settings" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 18127aa1a0..f033e867e3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 17:00:43 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 13 22:05:36 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1180,7 +1180,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.11.13.all.snap_36958"; + public static final String TS_SIGNATURE = "rusEFI 2022.11.13.all.snap_57724"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1256;