diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index c989d83025..9679e317dc 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4188838529 +#define SIGNATURE_HASH 3263455330 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-2chan.4188838529" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-2chan.3263455330" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index 754a1ab220..feef4a2cfe 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1208,7 +1208,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2735638479 +#define SIGNATURE_HASH 2552659244 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1585,7 +1585,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan.2735638479" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan.2552659244" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 7a7622ef92..aa14c6b5e3 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1208,7 +1208,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2735638479 +#define SIGNATURE_HASH 2552659244 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1585,7 +1585,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan_f7.2735638479" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan_f7.2552659244" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index 1564a25fa1..06b1fea15c 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3902442978 +#define SIGNATURE_HASH 3551688449 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan-revA.3902442978" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan-revA.3551688449" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index a429027861..648f0c0d79 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3543643058 +#define SIGNATURE_HASH 3894364497 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan.3543643058" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan.3894364497" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 1efd0548da..8c395ad61c 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3543643058 +#define SIGNATURE_HASH 3894364497 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan_f7.3543643058" +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan_f7.3894364497" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index 137f6a401b..3fc0869b3b 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.at_start_f435.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.at_start_f435.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index 8492c0f4e6..fb4a436b5a 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4218868283 +#define SIGNATURE_HASH 3227396312 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.atlas.4218868283" +#define TS_SIGNATURE "rusEFI master.2024.04.20.atlas.3227396312" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index 4e97789d01..99a39b0128 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 455146772 +#define SIGNATURE_HASH 537397239 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.f407-discovery.455146772" +#define TS_SIGNATURE "rusEFI master.2024.04.20.f407-discovery.537397239" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 77b175e192..fa0b00f316 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.f429-discovery.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.f429-discovery.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index e6b394c35b..4423ba4f43 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2376466662 +#define SIGNATURE_HASH 3062823429 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.f469-discovery.2376466662" +#define TS_SIGNATURE "rusEFI master.2024.04.20.f469-discovery.3062823429" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index d764bd2c6b..921da6f24e 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets true -#define SIGNATURE_HASH 3924980334 +#define SIGNATURE_HASH 3537537165 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.frankenso_na6.3924980334" +#define TS_SIGNATURE "rusEFI master.2024.04.20.frankenso_na6.3537537165" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index ffc2925c2e..edff84c332 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.haba208.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.haba208.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 6c15791e33..65d79f6dd5 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 913940209 +#define SIGNATURE_HASH 223437842 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-112-17.913940209" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-112-17.223437842" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 977ff3c6e6..cd4f3054a7 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1929929165 +#define SIGNATURE_HASH 1210096430 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-gm-e67.1929929165" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-gm-e67.1210096430" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index d3fca69565..129e994664 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1314284078 +#define SIGNATURE_HASH 1971230925 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1586,7 +1586,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-honda-k.1314284078" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-honda-k.1971230925" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index f68b2d3795..976552088e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1449783381 +#define SIGNATURE_HASH 1832979126 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-nb1.1449783381" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-nb1.1832979126" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index b83f834f59..d6d38f3a68 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2462820450 +#define SIGNATURE_HASH 2850247297 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121nissan.2462820450" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121nissan.2850247297" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 7dcef799b9..54e4020b88 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2399673235 +#define SIGNATURE_HASH 3022053744 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121vag.2399673235" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121vag.3022053744" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index 20cf0218bd..f6696dbd11 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1390619778 +#define SIGNATURE_HASH 1774966369 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen128.1390619778" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen128.1774966369" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 924e069701..aa94992c97 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1212946951 +#define SIGNATURE_HASH 1935991012 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai.1212946951" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai.1935991012" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index c11967f18a..e0eaa89177 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2118860672 +#define SIGNATURE_HASH 1164166499 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai_f7.2118860672" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai_f7.1164166499" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index 647812351f..535277e9e9 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 1066463977 +#define SIGNATURE_HASH 79169546 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen72.1066463977" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen72.79169546" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index ea77027a05..3e75f8e50c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3672217235 +#define SIGNATURE_HASH 3788074096 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen81.3672217235" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen81.3788074096" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index ca6a51dc3b..2125b3351f 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3452077008 +#define SIGNATURE_HASH 4142561587 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output false -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen88bmw.3452077008" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen88bmw.4142561587" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index 3327351e1b..d4bb8af19e 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 735372693 +#define SIGNATURE_HASH 284958582 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA6.735372693" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA6.284958582" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 58609296ab..f15320e041 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1208,7 +1208,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3557730139 +#define SIGNATURE_HASH 4012268984 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1585,7 +1585,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA8_96.3557730139" +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA8_96.4012268984" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 5549ff2dae..6ae448e990 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 197869226 +#define SIGNATURE_HASH 820233289 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.m74_9.197869226" +#define TS_SIGNATURE "rusEFI master.2024.04.20.m74_9.820233289" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index 6c571579ab..d2ce6d982b 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3166591114 +#define SIGNATURE_HASH 2274796137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f4.3166591114" +#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f4.2274796137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index b477b27bc0..c9b203b6ea 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1207,7 +1207,7 @@ #define show_microRusEFI_presets true #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3166591114 +#define SIGNATURE_HASH 2274796137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f7.3166591114" +#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f7.2274796137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index c58b42046e..40de13e05c 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.nucleo_f413.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.nucleo_f413.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_405.h b/firmware/controllers/generated/rusefi_generated_prometheus_405.h index a2756a4cb0..becf5c6e37 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_405.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_405.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2414201829 +#define SIGNATURE_HASH 3033346310 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_405.2414201829" +#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_405.3033346310" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_prometheus_469.h b/firmware/controllers/generated/rusefi_generated_prometheus_469.h index bbdd4514e5..3a8c62f76b 100644 --- a/firmware/controllers/generated/rusefi_generated_prometheus_469.h +++ b/firmware/controllers/generated/rusefi_generated_prometheus_469.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2414201829 +#define SIGNATURE_HASH 3033346310 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_469.2414201829" +#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_469.3033346310" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index 4a5e16ee1c..56cb8556f8 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1433058391 +#define SIGNATURE_HASH 1849837236 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f4.1433058391" +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f4.1849837236" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index fee92222d0..ebfefa781f 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1433058391 +#define SIGNATURE_HASH 1849837236 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f7.1433058391" +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f7.1849837236" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index 6c1dc7e26c..02a72cd79e 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets true #define show_test_presets false -#define SIGNATURE_HASH 1433058391 +#define SIGNATURE_HASH 1849837236 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_h7.1433058391" +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_h7.1849837236" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 9e3399d70d..30b492af7d 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 16418487 +#define SIGNATURE_HASH 1003650132 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.s105.16418487" +#define TS_SIGNATURE "rusEFI master.2024.04.20.s105.1003650132" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index 5a3ea7a869..00d5102ffc 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1207,7 +1207,7 @@ #define show_Proteus_presets false #define show_small_can_board_presets true #define show_test_presets false -#define SIGNATURE_HASH 429663319 +#define SIGNATURE_HASH 582278836 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1585,7 +1585,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.small-can-board.429663319" +#define TS_SIGNATURE "rusEFI master.2024.04.20.small-can-board.582278836" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 291a667bae..c9025e1469 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f429_nucleo.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f429_nucleo.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index d4f09f97be..5bcf2b186c 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f767_nucleo.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f767_nucleo.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index 392f639478..90c79bd74f 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32h743_nucleo.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32h743_nucleo.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index 5ff3a711ae..337be1dade 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 3211855477 +#define SIGNATURE_HASH 2220489878 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.t-b-g.3211855477" +#define TS_SIGNATURE "rusEFI master.2024.04.20.t-b-g.2220489878" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index fba40d31e8..60cb4a6613 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1206,7 +1206,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 2237446909 +#define SIGNATURE_HASH 3195289630 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1583,7 +1583,7 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.tdg-pdm8.2237446909" +#define TS_SIGNATURE "rusEFI master.2024.04.20.tdg-pdm8.3195289630" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 530b19b751..a5f2b8c9eb 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1207,7 +1207,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_uaefi_presets true -#define SIGNATURE_HASH 3305864014 +#define SIGNATURE_HASH 4263739821 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1584,7 +1584,7 @@ #define ts_show_vr_threshold_all true #define ts_show_vr_threshold_pins false #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI master.2024.04.20.uaefi.3305864014" +#define TS_SIGNATURE "rusEFI master.2024.04.20.uaefi.4263739821" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 848c7db84c..8b51ce8620 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4188838529 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-2chan.4188838529" +#define SIGNATURE_HASH 3263455330 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-2chan.3263455330" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 7c8379d19a..a35679035f 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2735638479 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan.2735638479" +#define SIGNATURE_HASH 2552659244 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan.2552659244" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 1619467692..3d705261f9 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2735638479 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan_f7.2735638479" +#define SIGNATURE_HASH 2552659244 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-4chan_f7.2552659244" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index bc7bacdf63..04bc277fd4 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3902442978 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan-revA.3902442978" +#define SIGNATURE_HASH 3551688449 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan-revA.3551688449" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 649a480afa..3b009d57a3 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3543643058 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan.3543643058" +#define SIGNATURE_HASH 3894364497 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan.3894364497" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index b4791e575a..ead518f491 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3543643058 -#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan_f7.3543643058" +#define SIGNATURE_HASH 3894364497 +#define TS_SIGNATURE "rusEFI master.2024.04.20.alphax-8chan_f7.3894364497" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index b2d77eb577..5b353d80dc 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.at_start_f435.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.at_start_f435.2220489878" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index a66b9411a3..eae1e934c5 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4218868283 -#define TS_SIGNATURE "rusEFI master.2024.04.20.atlas.4218868283" +#define SIGNATURE_HASH 3227396312 +#define TS_SIGNATURE "rusEFI master.2024.04.20.atlas.3227396312" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 761e232d07..d655b932f2 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 455146772 -#define TS_SIGNATURE "rusEFI master.2024.04.20.f407-discovery.455146772" +#define SIGNATURE_HASH 537397239 +#define TS_SIGNATURE "rusEFI master.2024.04.20.f407-discovery.537397239" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index e3a7cfca92..c257e8a8e4 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.f429-discovery.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.f429-discovery.2220489878" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index d95044b7a5..95244d27b5 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2376466662 -#define TS_SIGNATURE "rusEFI master.2024.04.20.f469-discovery.2376466662" +#define SIGNATURE_HASH 3062823429 +#define TS_SIGNATURE "rusEFI master.2024.04.20.f469-discovery.3062823429" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 7ea29a96bd..c64e7664f0 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3924980334 -#define TS_SIGNATURE "rusEFI master.2024.04.20.frankenso_na6.3924980334" +#define SIGNATURE_HASH 3537537165 +#define TS_SIGNATURE "rusEFI master.2024.04.20.frankenso_na6.3537537165" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 2c57c6e6c8..d9271d2f9e 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.haba208.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.haba208.2220489878" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 9323fc33e1..8a36e24fa9 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 913940209 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-112-17.913940209" +#define SIGNATURE_HASH 223437842 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-112-17.223437842" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 90d0a875f3..c5f8064ece 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1929929165 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-gm-e67.1929929165" +#define SIGNATURE_HASH 1210096430 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-gm-e67.1210096430" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 042c045608..931e5a8509 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1314284078 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-honda-k.1314284078" +#define SIGNATURE_HASH 1971230925 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-honda-k.1971230925" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index efd4769256..b956b2d79c 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1449783381 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-nb1.1449783381" +#define SIGNATURE_HASH 1832979126 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen-nb1.1832979126" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index e7b0aaaf2c..5bc8571a2d 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2462820450 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121nissan.2462820450" +#define SIGNATURE_HASH 2850247297 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121nissan.2850247297" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 3e7dbce150..2efd25bcbd 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2399673235 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121vag.2399673235" +#define SIGNATURE_HASH 3022053744 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen121vag.3022053744" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index e417d1097e..646233933c 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1390619778 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen128.1390619778" +#define SIGNATURE_HASH 1774966369 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen128.1774966369" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 54083b67aa..b96aa66b11 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1212946951 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai.1212946951" +#define SIGNATURE_HASH 1935991012 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai.1935991012" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 1eeac05d0d..dcb3ded994 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2118860672 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai_f7.2118860672" +#define SIGNATURE_HASH 1164166499 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen154hyundai_f7.1164166499" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index e13b1c16b3..097f6e9f54 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1066463977 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen72.1066463977" +#define SIGNATURE_HASH 79169546 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen72.79169546" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 43416b9636..ad4d1693a7 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3672217235 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen81.3672217235" +#define SIGNATURE_HASH 3788074096 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen81.3788074096" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index cb2612ec96..7d1abe21f0 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3452077008 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen88bmw.3452077008" +#define SIGNATURE_HASH 4142561587 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellen88bmw.4142561587" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 65a12c46da..33f2454447 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 735372693 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA6.735372693" +#define SIGNATURE_HASH 284958582 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA6.284958582" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 8a29ae4411..c5f0633c85 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3557730139 -#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA8_96.3557730139" +#define SIGNATURE_HASH 4012268984 +#define TS_SIGNATURE "rusEFI master.2024.04.20.hellenNA8_96.4012268984" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index c41675b2d2..e1e4a6f53a 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 197869226 -#define TS_SIGNATURE "rusEFI master.2024.04.20.m74_9.197869226" +#define SIGNATURE_HASH 820233289 +#define TS_SIGNATURE "rusEFI master.2024.04.20.m74_9.820233289" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b6b59503ca..4a3ee90bb6 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3166591114 -#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f4.3166591114" +#define SIGNATURE_HASH 2274796137 +#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f4.2274796137" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index cfbf05f82c..5e0d083c0f 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3166591114 -#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f7.3166591114" +#define SIGNATURE_HASH 2274796137 +#define TS_SIGNATURE "rusEFI master.2024.04.20.mre_f7.2274796137" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index a6c37a5823..a13e58d04e 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.nucleo_f413.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.nucleo_f413.2220489878" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index b6cbd1bc00..cf331a6267 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2414201829 -#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_405.2414201829" +#define SIGNATURE_HASH 3033346310 +#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_405.3033346310" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 2196210379..3389eb7951 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2414201829 -#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_469.2414201829" +#define SIGNATURE_HASH 3033346310 +#define TS_SIGNATURE "rusEFI master.2024.04.20.prometheus_469.3033346310" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 668bd6a7f0..8b31da8af3 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1433058391 -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f4.1433058391" +#define SIGNATURE_HASH 1849837236 +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f4.1849837236" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ee155ddc36..e5ad7f1cf4 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1433058391 -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f7.1433058391" +#define SIGNATURE_HASH 1849837236 +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_f7.1849837236" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index e560c0bcfa..1d77ff352a 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1433058391 -#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_h7.1433058391" +#define SIGNATURE_HASH 1849837236 +#define TS_SIGNATURE "rusEFI master.2024.04.20.proteus_h7.1849837236" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 9b59ac6a23..1d2a18874f 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 16418487 -#define TS_SIGNATURE "rusEFI master.2024.04.20.s105.16418487" +#define SIGNATURE_HASH 1003650132 +#define TS_SIGNATURE "rusEFI master.2024.04.20.s105.1003650132" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index 32d5119b86..569fb3460a 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 429663319 -#define TS_SIGNATURE "rusEFI master.2024.04.20.small-can-board.429663319" +#define SIGNATURE_HASH 582278836 +#define TS_SIGNATURE "rusEFI master.2024.04.20.small-can-board.582278836" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 9a01968dea..9b46fea485 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f429_nucleo.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f429_nucleo.2220489878" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index 38e6f94211..8ef1be2eb6 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f767_nucleo.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32f767_nucleo.2220489878" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index 89e2c2188b..4714a902cf 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32h743_nucleo.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.stm32h743_nucleo.2220489878" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 2aaaa96f7c..b3cb71bd53 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3211855477 -#define TS_SIGNATURE "rusEFI master.2024.04.20.t-b-g.3211855477" +#define SIGNATURE_HASH 2220489878 +#define TS_SIGNATURE "rusEFI master.2024.04.20.t-b-g.2220489878" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 7865930969..1812200b09 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 config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2237446909 -#define TS_SIGNATURE "rusEFI master.2024.04.20.tdg-pdm8.2237446909" +#define SIGNATURE_HASH 3195289630 +#define TS_SIGNATURE "rusEFI master.2024.04.20.tdg-pdm8.3195289630" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 08ff2256c6..83e2b0524b 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3305864014 -#define TS_SIGNATURE "rusEFI master.2024.04.20.uaefi.3305864014" +#define SIGNATURE_HASH 4263739821 +#define TS_SIGNATURE "rusEFI master.2024.04.20.uaefi.4263739821" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 7f3cec3c01..1a2f1e7a78 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.f407-discovery.455146772" + signature = "rusEFI master.2024.04.20.f407-discovery.537397239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.f407-discovery.455146772" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.f407-discovery.537397239" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:38 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:15 UTC 2024 pageSize = 22656 page = 1 @@ -6108,6 +6108,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6120,7 +6128,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8101,17 +8108,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8123,6 +8141,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9237,8 +9259,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index f91a923f6c..ef379479d5 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-2chan.4188838529" + signature = "rusEFI master.2024.04.20.alphax-2chan.3263455330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-2chan.4188838529" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-2chan.3263455330" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","X1 - AIN1","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT","X3 - AIN2","X7 - AIN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:28 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:04 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6114,7 +6122,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8059,17 +8066,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8081,6 +8099,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9179,8 +9201,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index dea904dc0f..d8413efd69 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-4chan.2735638479" + signature = "rusEFI master.2024.04.20.alphax-4chan.2552659244" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-4chan.2735638479" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-4chan.2552659244" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:37 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:14 UTC 2024 pageSize = 22656 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6128,7 +6136,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8081,17 +8088,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8103,6 +8121,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9202,8 +9224,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index 36f7880e78..b47889d3b7 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-4chan_f7.2735638479" + signature = "rusEFI master.2024.04.20.alphax-4chan_f7.2552659244" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-4chan_f7.2735638479" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-4chan_f7.2552659244" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","X7 - AIN4","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","INVALID","INVALID","INVALID","INVALID","X3 - AIN2","X1 - AIN1 and D5 on older boards" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:36 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:13 UTC 2024 pageSize = 22656 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6128,7 +6136,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8081,17 +8088,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8103,6 +8121,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9202,8 +9224,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 4e47416bf8..5f46ee31ce 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-8chan-revA.3902442978" + signature = "rusEFI master.2024.04.20.alphax-8chan-revA.3551688449" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-8chan-revA.3902442978" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-8chan-revA.3551688449" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","31C - PPS2","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:45 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:22 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6115,7 +6123,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8061,17 +8068,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8083,6 +8101,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9181,8 +9203,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index 99a96b8dfe..24fa3ca7a1 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-8chan.3543643058" + signature = "rusEFI master.2024.04.20.alphax-8chan.3894364497" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-8chan.3543643058" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-8chan.3894364497" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:51 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:28 UTC 2024 pageSize = 22672 page = 1 @@ -6109,6 +6109,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6119,7 +6127,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8066,17 +8073,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8088,6 +8106,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9186,8 +9208,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index b8714508b6..1ffdc5554c 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.alphax-8chan_f7.3543643058" + signature = "rusEFI master.2024.04.20.alphax-8chan_f7.3894364497" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.alphax-8chan_f7.3543643058" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.alphax-8chan_f7.3894364497" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","3A - Aux Analog 2","On-board MAP","32A - PPS Sensor Input","31A - TPS Sensor Input","24 - Ignition Key Voltage","INVALID","INVALID","19A - Aux Analog 6","1A - Aux Analog 1","2A - Aux Analog 4","INVALID","29A - CLT Sensor Input","27A - IAT Sensor Input","INVALID","12A - Aux Analog 8","INVALID","11A - Aux Analog 3","INVALID","34A - PPS2 Sensor Input","33A - TPS2 Sensor Input","INVALID","INVALID","INVALID","4A - Aux Analog 7","INVALID","10A - Aux Analog 5","INVALID","28A - Aux Temp 2","28A - Aux Temp 1","INVALID","20A - Aux Analog 9" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:52 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:29 UTC 2024 pageSize = 22672 page = 1 @@ -6109,6 +6109,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6119,7 +6127,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8066,17 +8073,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8088,6 +8106,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9186,8 +9208,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 2139a508b6..79c2fb4d23 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.at_start_f435.3211855477" + signature = "rusEFI master.2024.04.20.at_start_f435.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.at_start_f435.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.at_start_f435.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:32 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:09 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 99edff4a2b..c42fc978c4 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.atlas.4218868283" + signature = "rusEFI master.2024.04.20.atlas.3227396312" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.atlas.4218868283" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.atlas.3227396312" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:31 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:08 UTC 2024 pageSize = 22156 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8085,17 +8092,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8107,6 +8125,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9217,8 +9239,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index ad9d11848a..2911f176ad 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.f407-discovery.455146772" + signature = "rusEFI master.2024.04.20.f407-discovery.537397239" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.f407-discovery.455146772" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.f407-discovery.537397239" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:01 UTC 2024 pageSize = 22656 page = 1 @@ -6108,6 +6108,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6120,7 +6128,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8101,17 +8108,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8123,6 +8141,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9237,8 +9259,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 28d5f72b3f..13fe9597b3 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.f429-discovery.3211855477" + signature = "rusEFI master.2024.04.20.f429-discovery.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.f429-discovery.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.f429-discovery.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:34 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:10 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 582643cfeb..7d570e372e 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.f469-discovery.2376466662" + signature = "rusEFI master.2024.04.20.f469-discovery.3062823429" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.f469-discovery.2376466662" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.f469-discovery.3062823429" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:00 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 78b5826863..f28333db68 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.frankenso_na6.3924980334" + signature = "rusEFI master.2024.04.20.frankenso_na6.3537537165" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.frankenso_na6.3924980334" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.frankenso_na6.3537537165" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:18 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:40:55 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index 0c1ac83e54..af85b55aeb 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.haba208.3211855477" + signature = "rusEFI master.2024.04.20.haba208.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.haba208.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.haba208.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:55 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index a0094af43d..0efdb6c2d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen-112-17.913940209" + signature = "rusEFI master.2024.04.20.hellen-112-17.223437842" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen-112-17.913940209" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen-112-17.223437842" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","B20 TPS Throttle Position 2","A14 Analog Input","INVALID","A21 PPS1","B03 TPS Throttle Position 1","INVALID","A07 TODO","A12 Analog Input","A10 Analog Input","INVALID","B19 MAP","A09 Analog Input","B15 CLT","B27 IAT","A11 Analog Input","A19 Analog Input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:25 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:02 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6115,7 +6123,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8059,17 +8066,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8081,6 +8099,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9179,8 +9201,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 182c9ca41e..c535f8f550 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen-gm-e67.1929929165" + signature = "rusEFI master.2024.04.20.hellen-gm-e67.1210096430" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen-gm-e67.1929929165" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen-gm-e67.1210096430" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:29 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:06 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9208,8 +9230,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 9497de2ecb..ea6a6e1c7b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2024.04.20.hellen-honda-k.1314284078" + signature = "rusEFI master.2024.04.20.hellen-honda-k.1971230925" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen-honda-k.1314284078" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen-honda-k.1971230925" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -5934,6 +5934,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -5944,7 +5952,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -7834,16 +7841,27 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -7855,6 +7873,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } field = "Idle Solenoid Secondary output", secondSolenoidPin, { idle_solenoidPin != 0 || (!useStepperIdle && isDoubleSolenoidIdle ) } @@ -8906,8 +8928,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 493d0aab5d..c298a9071e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen-nb1.1449783381" + signature = "rusEFI master.2024.04.20.hellen-nb1.1832979126" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen-nb1.1449783381" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen-nb1.1832979126" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:44 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:21 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9208,8 +9230,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 03409bea99..ee05d34bfe 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen121nissan.2462820450" + signature = "rusEFI master.2024.04.20.hellen121nissan.2850247297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen121nissan.2462820450" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen121nissan.2850247297" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:15 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6115,7 +6123,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8055,17 +8062,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8077,6 +8095,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9172,8 +9194,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 2e395f03f4..261e5098f0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen121vag.2399673235" + signature = "rusEFI master.2024.04.20.hellen121vag.3022053744" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen121vag.2399673235" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen121vag.3022053744" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:24 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:00 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9207,8 +9229,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index d7e748f96c..7df11578cc 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen128.1390619778" + signature = "rusEFI master.2024.04.20.hellen128.1774966369" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen128.1390619778" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen128.1774966369" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:49 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:26 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8083,17 +8090,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8105,6 +8123,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9206,8 +9228,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 5816ba3b34..5a2efe1c7b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen154hyundai.1212946951" + signature = "rusEFI master.2024.04.20.hellen154hyundai.1935991012" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen154hyundai.1212946951" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen154hyundai.1935991012" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","K54 A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:56 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:33 UTC 2024 pageSize = 22656 page = 1 @@ -6086,6 +6086,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6096,7 +6104,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8026,17 +8033,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8048,6 +8066,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9132,8 +9154,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index f978d82ac5..5c8dd64989 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen154hyundai_f7.2118860672" + signature = "rusEFI master.2024.04.20.hellen154hyundai_f7.1164166499" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen154hyundai_f7.2118860672" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen154hyundai_f7.1164166499" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:43 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:19 UTC 2024 pageSize = 22656 page = 1 @@ -6086,6 +6086,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6096,7 +6104,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8026,17 +8033,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8048,6 +8066,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9132,8 +9154,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 8cf4c9af3b..39d37d7de8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen72.1066463977" + signature = "rusEFI master.2024.04.20.hellen72.79169546" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen72.1066463977" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen72.79169546" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:11 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9208,8 +9230,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 4afeb7f4f0..26c70805a8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen81.3672217235" + signature = "rusEFI master.2024.04.20.hellen81.3788074096" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen81.3672217235" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen81.3788074096" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:59 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:36 UTC 2024 pageSize = 22656 page = 1 @@ -6103,6 +6103,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6115,7 +6123,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8082,17 +8089,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8104,6 +8122,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9205,8 +9227,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 16d96c5df5..075a3e8576 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellen88bmw.3452077008" + signature = "rusEFI master.2024.04.20.hellen88bmw.4142561587" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellen88bmw.3452077008" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellen88bmw.4142561587" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:07 UTC 2024 pageSize = 22656 page = 1 @@ -6101,6 +6101,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6113,7 +6121,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8079,17 +8086,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8101,6 +8119,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9200,8 +9222,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 8a5f04ff30..7554524bfd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellenNA6.735372693" + signature = "rusEFI master.2024.04.20.hellenNA6.284958582" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellenNA6.735372693" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellenNA6.284958582" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:58 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:34 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9208,8 +9230,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 7ce939f9fb..2a3cedad56 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.hellenNA8_96.3557730139" + signature = "rusEFI master.2024.04.20.hellenNA8_96.4012268984" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.hellenNA8_96.3557730139" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.hellenNA8_96.4012268984" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:33 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:10 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9208,8 +9230,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index d9c7e203ff..7fb9346ec5 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.m74_9.197869226" + signature = "rusEFI master.2024.04.20.m74_9.820233289" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.m74_9.197869226" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.m74_9.820233289" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","MAF/MAP sensor signal","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Pedal position sensor 1 signal PPS1","Pedal position sensor 2 signal PPS2","ETB TPS position sensor 1 signal","ETB TPS position sensor 2 signal" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:57 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8086,17 +8093,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8108,6 +8126,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9212,8 +9234,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 77fd982983..a35c30a7f9 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.mre_f4.3166591114" + signature = "rusEFI master.2024.04.20.mre_f4.2274796137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.mre_f4.3166591114" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.mre_f4.2274796137" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:19 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:40:56 UTC 2024 pageSize = 22656 page = 1 @@ -6119,6 +6119,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6131,7 +6139,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8106,17 +8113,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8128,6 +8146,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9215,8 +9237,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 26f5b58f30..e753ea5965 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.mre_f7.3166591114" + signature = "rusEFI master.2024.04.20.mre_f7.2274796137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.mre_f7.3166591114" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.mre_f7.2274796137" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3 or Hall Input","22 - AN temp 4 or Hall Input","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:21 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:40:58 UTC 2024 pageSize = 22656 page = 1 @@ -6119,6 +6119,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6131,7 +6139,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8106,17 +8113,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8128,6 +8146,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9215,8 +9237,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index 0de94de500..dd01317891 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.nucleo_f413.3211855477" + signature = "rusEFI master.2024.04.20.nucleo_f413.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.nucleo_f413.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.nucleo_f413.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:22 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:40:59 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 156349c982..16a9260004 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.prometheus_405.2414201829" + signature = "rusEFI master.2024.04.20.prometheus_405.3033346310" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.prometheus_405.2414201829" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.prometheus_405.3033346310" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:27 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:03 UTC 2024 pageSize = 22656 page = 1 @@ -6099,6 +6099,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6111,7 +6119,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8088,17 +8095,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8110,6 +8128,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9221,8 +9243,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1a0e021855..c697e70612 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.prometheus_469.2414201829" + signature = "rusEFI master.2024.04.20.prometheus_469.3033346310" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.prometheus_469.2414201829" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.prometheus_469.3033346310" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:29 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:05 UTC 2024 pageSize = 22656 page = 1 @@ -6099,6 +6099,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6111,7 +6119,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8088,17 +8095,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8110,6 +8128,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9221,8 +9243,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 721e806199..adc751fb4d 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.proteus_f4.1433058391" + signature = "rusEFI master.2024.04.20.proteus_f4.1849837236" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.proteus_f4.1433058391" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.proteus_f4.1849837236" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:08 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:44 UTC 2024 pageSize = 28156 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6130,7 +6138,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8120,17 +8127,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8142,6 +8160,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9245,8 +9267,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 35f2d32f39..9e24d04a64 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.proteus_f7.1433058391" + signature = "rusEFI master.2024.04.20.proteus_f7.1849837236" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.proteus_f7.1433058391" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.proteus_f7.1849837236" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:02 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:39 UTC 2024 pageSize = 28156 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6130,7 +6138,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8120,17 +8127,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8142,6 +8160,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9245,8 +9267,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 7637726852..422eed92a0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.proteus_h7.1433058391" + signature = "rusEFI master.2024.04.20.proteus_h7.1849837236" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.proteus_h7.1433058391" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.proteus_h7.1849837236" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:01 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:37 UTC 2024 pageSize = 28156 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6130,7 +6138,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8120,17 +8127,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8142,6 +8160,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9245,8 +9267,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 93b0881709..fb00d5626e 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.s105.16418487" + signature = "rusEFI master.2024.04.20.s105.1003650132" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.s105.16418487" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.s105.1003650132" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:35 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:11 UTC 2024 pageSize = 22656 page = 1 @@ -6105,6 +6105,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6117,7 +6125,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8084,17 +8091,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8106,6 +8124,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9210,8 +9232,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 07a0e7bc28..1c1c2e359b 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.small-can-board.429663319" + signature = "rusEFI master.2024.04.20.small-can-board.582278836" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.small-can-board.429663319" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.small-can-board.582278836" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","B2 - Analog/Digital Input","B3 - Analog/Digital Input","B4 - Analog/Digital Input","B5 - Analog/Digital Input","B7 - Analog/Digital Input","C1 - Analog/Digital Input 6","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","C2 - Analog/Digital Input 7","C4 - Analog/Digital Input 8" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:40 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:17 UTC 2024 pageSize = 22656 page = 1 @@ -6103,6 +6103,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6115,7 +6123,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8085,17 +8092,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8107,6 +8125,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9216,8 +9238,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index 58c94c9d8f..447e34dc7e 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.stm32f429_nucleo.3211855477" + signature = "rusEFI master.2024.04.20.stm32f429_nucleo.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.stm32f429_nucleo.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.stm32f429_nucleo.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:30 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:06 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 68eda02b28..7ebe80abd4 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.stm32f767_nucleo.3211855477" + signature = "rusEFI master.2024.04.20.stm32f767_nucleo.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.stm32f767_nucleo.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.stm32f767_nucleo.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:15 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:51 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index 46ed96ca4c..5a46fc8f21 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.stm32h743_nucleo.3211855477" + signature = "rusEFI master.2024.04.20.stm32h743_nucleo.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.stm32h743_nucleo.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.stm32h743_nucleo.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:20 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:56 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index c92eef6eeb..798be31cf4 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.t-b-g.3211855477" + signature = "rusEFI master.2024.04.20.t-b-g.2220489878" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.t-b-g.3211855477" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.t-b-g.2220489878" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:22 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:59 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 817b4825d4..1d250d0111 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.tdg-pdm8.2237446909" + signature = "rusEFI master.2024.04.20.tdg-pdm8.3195289630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.tdg-pdm8.2237446909" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.tdg-pdm8.3195289630" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:16 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:40:53 UTC 2024 pageSize = 22656 page = 1 @@ -6104,6 +6104,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6116,7 +6124,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8093,17 +8100,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8115,6 +8133,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9226,8 +9248,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index a924e17309..8f0f2333d9 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.04.20.uaefi.3305864014" + signature = "rusEFI master.2024.04.20.uaefi.4263739821" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.04.20.uaefi.3305864014" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.04.20.uaefi.4263739821" ; 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 @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","D1 AUX1","C3 AUX2","INVALID","D6 PPS1","D13 TPS1","A7 Voltage From Key","INVALID","C15 Fuel Pressure / AUX3","C14 TPS2","INVALID","D9 MAP","On-board MAP","D16 CLT Coolant","D15 IAT","C4 PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:21:55 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:41:32 UTC 2024 pageSize = 22656 page = 1 @@ -6118,6 +6118,14 @@ menuDialog = main subMenu = auxLinearSensors, "Aux Sensors" + menu = "CAN-bus" + subMenu = canBusMain, "CAN Bus Settings" + subMenu = std_separator + + subMenu = speedSensorCan "CAN Vehicle speed sensor" + subMenu = uegoCan, "CAN O2 sensors" + subMenu = egtInputsCan, "CAN EGT sensors" + menu = "&Controller" subMenu = ecuStimulator, "ECU stimulator" subMenu = ioTest, "Bench test" @@ -6128,7 +6136,6 @@ menuDialog = main subMenu = monitoringSettings, "rusEFI console" subMenu = std_separator - subMenu = canBusMain, "CAN Bus Communication" subMenu = sdCard, "SD Card Logger" subMenu = connection, "Connection" subMenu = std_separator @@ -8089,17 +8096,28 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - dialog = egoSettings, "", yAxis - field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + dialog = uegoCan, "CAN UEGO/wideband O2" + field = "Support for AEM or RusEFI CAN UEGO" + field = "Enable CAN Wideband", enableAemXSeries, { canReadEnabled } + field = "Wideband CAN bus", widebandOnSecondBus + field = "Force O2 sensor heating", forceO2Heating + + dialog = uegoSerial, "Innovale LC-2 serial" field = "Enable Innovate LC-2 Serial", enableInnovateLC2, { auxSerialRxPin && auxSerialTxPin } + + dialog = egoSettings, "", yAxis + panel = uegoCan + panel = uegoSerial panel = egoSettings_IO1 panel = egoSettings_IO2, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} panel = egoSettings_sensor, {afr_hwChannel != 0 && enableAemXSeries == 0 && !auxSerialRxPin && !auxSerialTxPin} ; Engine->EGT inputs - dialog = egtInputs, "EGT inputs" - field = "CAN support only EGT1 and EGT2" - field = "CAN EGT (AEM X series of RusEFI)" enableAemXSeriesEgt, { canReadEnabled } + dialog = egtInputsCan, "CAN EGT sensors" + field = "CAN support only EGT1 and EGT2 inputs" + field = "CAN EGT (AEM X series of RusEFI)", senableAemXSeriesEgt, { canReadEnabled } + + dialog = egtInputsSpi, "SPI EGT sensors" field = "If both CAN and SPI EGT sensors are used, please leave two first for CAN" field = "MAX31855/MAX31856 SPI", max31855spiDevice field = "CS for EGT1", max31855_cs1 @@ -8111,6 +8129,10 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "CS for EGT7", max31855_cs7 field = "CS for EGT8", max31855_cs8 + dialog = egtInputs, "EGT inputs" + panel = egtInputsCan + panel = egtInputsSpi + ; Engine->idle Settings dialog = idleSolenoid, "Solenoid" field = "Idle Solenoid Primary output", idle_solenoidPin, { idle_solenoidPin != 0 || !useStepperIdle } @@ -9210,8 +9232,6 @@ dialog = tcuControls, "Transmission Settings" field = "!Disconnect all controllers you don't want to set!" commandButton = "Set Index 0", cmd_set_wideband_idx_0 commandButton = "Set Index 1", cmd_set_wideband_idx_1 - field = "Wideband CAN bus", widebandOnSecondBus - field = "Force O2 sensor heating", forceO2Heating dialog = engineTypeDialog, "Popular vehicles" field = "!These buttons send a command to rusEFI controller to apply preset values" 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 00450db185..08fbe577de 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 config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 12:22:38 UTC 2024 +// this file was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Sat Apr 20 13:42:15 UTC 2024 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1138,7 +1138,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; - public static final int SIGNATURE_HASH = 455146772; + public static final int SIGNATURE_HASH = 537397239; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1390,7 +1390,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2024.04.20.f407-discovery.455146772"; + public static final String TS_SIGNATURE = "rusEFI master.2024.04.20.f407-discovery.537397239"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't';