diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 7804808664..3fb9d42759 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -521,8 +521,9 @@ struct engine_configuration_s { uint32_t cylindersCount; // offset 336 firing_order_e firingOrder; + // deg // offset 337 - uint8_t unusedOldBenchTest; + uint8_t vvtBumpAmount; // Duration of each test pulse // ms // offset 338 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index ed59f3991b..0f0e8f4e9e 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -74,6 +74,10 @@ #define bench_mode_e_BENCH_SECOND_IDLE_VALVE 13 #define bench_mode_e_BENCH_STARTER_DISABLE_RELAY 2 #define bench_mode_e_BENCH_STARTER_ENABLE_RELAY 1 +#define bench_mode_e_BENCH_VVT_1_TARGET_BUMP 17 +#define bench_mode_e_BENCH_VVT_2_TARGET_BUMP 18 +#define bench_mode_e_BENCH_VVT_3_TARGET_BUMP 19 +#define bench_mode_e_BENCH_VVT_4_TARGET_BUMP 20 #define blend_table_s_size 188 #define BLOCKING_FACTOR 750 #define BOOST_BLEND_COUNT 2 @@ -980,7 +984,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 4170676786 +#define SIGNATURE_HASH 1966803795 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1245,7 +1249,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.subaru_eg33_f7.4170676786" +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.subaru_eg33_f7.1966803795" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/algo/auto_generated_enginetypes.cpp b/firmware/controllers/algo/auto_generated_enginetypes.cpp index dc7ec082c1..eadcdc8fc2 100644 --- a/firmware/controllers/algo/auto_generated_enginetypes.cpp +++ b/firmware/controllers/algo/auto_generated_enginetypes.cpp @@ -36,6 +36,14 @@ case BENCH_STARTER_DISABLE_RELAY: return "BENCH_STARTER_DISABLE_RELAY"; case BENCH_STARTER_ENABLE_RELAY: return "BENCH_STARTER_ENABLE_RELAY"; +case BENCH_VVT_1_TARGET_BUMP: + return "BENCH_VVT_1_TARGET_BUMP"; +case BENCH_VVT_2_TARGET_BUMP: + return "BENCH_VVT_2_TARGET_BUMP"; +case BENCH_VVT_3_TARGET_BUMP: + return "BENCH_VVT_3_TARGET_BUMP"; +case BENCH_VVT_4_TARGET_BUMP: + return "BENCH_VVT_4_TARGET_BUMP"; } return NULL; } diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 7804808664..3fb9d42759 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -521,8 +521,9 @@ struct engine_configuration_s { uint32_t cylindersCount; // offset 336 firing_order_e firingOrder; + // deg // offset 337 - uint8_t unusedOldBenchTest; + uint8_t vvtBumpAmount; // Duration of each test pulse // ms // offset 338 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index fcee65709a..88937df770 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -81,6 +81,10 @@ #define bench_mode_e_BENCH_SECOND_IDLE_VALVE 13 #define bench_mode_e_BENCH_STARTER_DISABLE_RELAY 2 #define bench_mode_e_BENCH_STARTER_ENABLE_RELAY 1 +#define bench_mode_e_BENCH_VVT_1_TARGET_BUMP 17 +#define bench_mode_e_BENCH_VVT_2_TARGET_BUMP 18 +#define bench_mode_e_BENCH_VVT_3_TARGET_BUMP 19 +#define bench_mode_e_BENCH_VVT_4_TARGET_BUMP 20 #define blend_table_s_size 188 #define BLOCKING_FACTOR 750 #define BOOST_BLEND_COUNT 2 @@ -1030,7 +1034,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 564039752 +#define SIGNATURE_HASH 2889015593 #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 #define spi_device_e_SPI_DEVICE_2 2 @@ -1294,7 +1298,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 89814b3e18..c194e15afd 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 963044359 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.48way.963044359" +#define SIGNATURE_HASH 3033175398 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.48way.3033175398" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 06bf795117..6b6a77b6c4 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1491299194 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.alphax-2chan.1491299194" +#define SIGNATURE_HASH 3578731035 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.alphax-2chan.3578731035" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index c08fadd7f6..e8f1482cf1 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3526060315 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.alphax-4chan.3526060315" +#define SIGNATURE_HASH 1602689146 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.alphax-4chan.1602689146" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 1203246a49..5058326846 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2861592546 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.alphax-8chan.2861592546" +#define SIGNATURE_HASH 658251395 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.alphax-8chan.658251395" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 18ab889116..d79547d4ce 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1635162522 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.atlas.1635162522" +#define SIGNATURE_HASH 3973769467 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.atlas.3973769467" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index f4a8699d45..1b82368e2f 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1167810827 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.core8.1167810827" +#define SIGNATURE_HASH 3359051882 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.core8.3359051882" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 87f29b362d..069e42284b 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 564039752 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" +#define SIGNATURE_HASH 2889015593 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 415ce1afda..63a2f6cb73 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2109500605 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.f429-discovery.2109500605" +#define SIGNATURE_HASH 4027588060 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.f429-discovery.4027588060" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 9d3ade6eda..d269c89550 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1609469047 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.frankenso_na6.1609469047" +#define SIGNATURE_HASH 3527605526 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.frankenso_na6.3527605526" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index 3ff971240b..90285daabd 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 4096349383 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.harley81.4096349383" +#define SIGNATURE_HASH 2038769062 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.harley81.2038769062" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index da7aecdd30..18eb66eda8 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 349520494 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen-gm-e67.349520494" +#define SIGNATURE_HASH 2574856975 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen-gm-e67.2574856975" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 3cb8aba354..6ae85ac651 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2403634223 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen-honda-k.2403634223" +#define SIGNATURE_HASH 48823630 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen-honda-k.48823630" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 7e65a58d27..6c856179f2 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2325445889 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen-nb1.2325445889" +#define SIGNATURE_HASH 121048160 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen-nb1.121048160" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index e8281222a2..316c51d46a 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 4198551883 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen121nissan.4198551883" +#define SIGNATURE_HASH 2011996202 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen121nissan.2011996202" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 89ee639046..e1aa2383d2 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1447288472 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen121vag.1447288472" +#define SIGNATURE_HASH 3689918457 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen121vag.3689918457" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index a924f47734..aed6f7df85 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 4247653658 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen128.4247653658" +#define SIGNATURE_HASH 1887599739 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen128.1887599739" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 4570537680..603807f5c2 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1775840763 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen154hyundai.1775840763" +#define SIGNATURE_HASH 3832896666 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen154hyundai.3832896666" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index a306ed2af5..0dbbc1506d 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2349397258 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen72.2349397258" +#define SIGNATURE_HASH 27559019 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen72.27559019" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index ba5e28c7e9..2edc8cb95e 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 545427336 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen81.545427336" +#define SIGNATURE_HASH 2905538281 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen81.2905538281" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 8992f709e3..87b79d3557 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 649763003 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellen88bmw.649763003" +#define SIGNATURE_HASH 2870405594 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellen88bmw.2870405594" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 5a6b794096..c19bee7621 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1846291770 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellenNA6.1846291770" +#define SIGNATURE_HASH 3818937435 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellenNA6.3818937435" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 4dd99cc7e6..b113fd8e59 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3534248586 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.hellenNA8_96.3534248586" +#define SIGNATURE_HASH 1594108907 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.hellenNA8_96.1594108907" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index fc5321a9cc..b05b7a624a 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2586970373 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.mre_f4.2586970373" +#define SIGNATURE_HASH 396261476 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.mre_f4.396261476" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 65c835dca3..f03a7c13d9 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2586970373 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.mre_f7.2586970373" +#define SIGNATURE_HASH 396261476 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.mre_f7.396261476" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index f9cfe61d7b..92d33d8835 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1294508333 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.prometheus_405.1294508333" +#define SIGNATURE_HASH 3229929548 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.prometheus_405.3229929548" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 8c5666bd0c..4e50bb2e5d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 1294508333 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.prometheus_469.1294508333" +#define SIGNATURE_HASH 3229929548 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.prometheus_469.3229929548" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 0fccff985c..bcac04b278 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3967987542 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.proteus_f4.3967987542" +#define SIGNATURE_HASH 1630461495 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.proteus_f4.1630461495" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index eef313c395..0299ee086b 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3967987542 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.proteus_f7.3967987542" +#define SIGNATURE_HASH 1630461495 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.proteus_f7.1630461495" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 33e188a6d3..e635ea44eb 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 3967987542 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.proteus_h7.3967987542" +#define SIGNATURE_HASH 1630461495 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.proteus_h7.1630461495" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index d89e7d2d8b..1f504e66e6 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 2513468195 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.small-can-board.2513468195" +#define SIGNATURE_HASH 410782274 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.small-can-board.410782274" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 94b13fcf07..d507323a3d 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 4170676786 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.subaru_eg33_f7.4170676786" +#define SIGNATURE_HASH 1966803795 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.subaru_eg33_f7.1966803795" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 338e97e869..f8e2dcc5e8 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -1,2 +1,2 @@ -#define SIGNATURE_HASH 4145168543 -#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.21.tdg-pdm8.4145168543" +#define SIGNATURE_HASH 2059284990 +#define TS_SIGNATURE "rusEFI (FOME) master.2023.10.24.tdg-pdm8.2059284990" diff --git a/firmware/controllers/lua/generated/value_lookup_generated.cpp b/firmware/controllers/lua/generated/value_lookup_generated.cpp index 66aef8590d..bdf18a97fd 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/value_lookup_generated.cpp @@ -137,6 +137,8 @@ float getConfigValueByName(const char *name) { return engineConfiguration->triggerSimulatorRpm; case -1578655365: return engineConfiguration->cylindersCount; + case -107085459: + return engineConfiguration->vvtBumpAmount; case -1992436143: return engineConfiguration->benchTestOnTime; case 1425664391: @@ -1409,6 +1411,11 @@ void setConfigValueByName(const char *name, float value) { { engineConfiguration->cylindersCount = (int)value; return; + } + case -107085459: + { + engineConfiguration->vvtBumpAmount = (int)value; + return; } case -1992436143: { diff --git a/firmware/controllers/lua/generated/value_lookup_generated.md b/firmware/controllers/lua/generated/value_lookup_generated.md index 1f54c560fc..0f74c38318 100644 --- a/firmware/controllers/lua/generated/value_lookup_generated.md +++ b/firmware/controllers/lua/generated/value_lookup_generated.md @@ -199,6 +199,9 @@ Engine displacement in litres ### cylindersCount Number of cylinder the engine has. +### vvtBumpAmount + + ### benchTestOnTime Duration of each test pulse diff --git a/firmware/tunerstudio/generated/fome.ini b/firmware/tunerstudio/generated/fome.ini index b00834a150..40d2191313 100644 --- a/firmware/tunerstudio/generated/fome.ini +++ b/firmware/tunerstudio/generated/fome.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" + signature = "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5353,6 +5353,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7277,6 +7282,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7287,6 +7302,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_48way.ini b/firmware/tunerstudio/generated/fome_48way.ini index 21e04cd748..b5bc6dc1e0 100644 --- a/firmware/tunerstudio/generated/fome_48way.ini +++ b/firmware/tunerstudio/generated/fome_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.48way.963044359" + signature = "rusEFI (FOME) master.2023.10.24.48way.3033175398" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.48way.963044359" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.48way.3033175398" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5353,6 +5353,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7277,6 +7282,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7287,6 +7302,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index fe5d77edc7..7626dc20b9 100644 --- a/firmware/tunerstudio/generated/fome_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.alphax-2chan.1491299194" + signature = "rusEFI (FOME) master.2023.10.24.alphax-2chan.3578731035" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.alphax-2chan.1491299194" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.alphax-2chan.3578731035" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5349,6 +5349,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7262,6 +7267,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7272,6 +7287,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index d86965e24a..294136673a 100644 --- a/firmware/tunerstudio/generated/fome_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.alphax-4chan.3526060315" + signature = "rusEFI (FOME) master.2023.10.24.alphax-4chan.1602689146" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.alphax-4chan.3526060315" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.alphax-4chan.1602689146" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index a4dea66d12..60f04232ba 100644 --- a/firmware/tunerstudio/generated/fome_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.alphax-8chan.2861592546" + signature = "rusEFI (FOME) master.2023.10.24.alphax-8chan.658251395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.alphax-8chan.2861592546" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.alphax-8chan.658251395" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index 1e1b2d6b89..1a9e4f1954 100644 --- a/firmware/tunerstudio/generated/fome_atlas.ini +++ b/firmware/tunerstudio/generated/fome_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.atlas.1635162522" + signature = "rusEFI (FOME) master.2023.10.24.atlas.3973769467" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.atlas.1635162522" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.atlas.3973769467" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5351,6 +5351,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7267,6 +7272,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7277,6 +7292,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index e92c71c646..3840276f10 100644 --- a/firmware/tunerstudio/generated/fome_core8.ini +++ b/firmware/tunerstudio/generated/fome_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.core8.1167810827" + signature = "rusEFI (FOME) master.2023.10.24.core8.3359051882" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.core8.1167810827" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.core8.3359051882" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5353,6 +5353,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7277,6 +7282,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7287,6 +7302,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index b00834a150..40d2191313 100644 --- a/firmware/tunerstudio/generated/fome_f407-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" + signature = "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.f407-discovery.564039752" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5353,6 +5353,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7277,6 +7282,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7287,6 +7302,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 8c0e43b6a5..aeb49af08e 100644 --- a/firmware/tunerstudio/generated/fome_f429-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.f429-discovery.2109500605" + signature = "rusEFI (FOME) master.2023.10.24.f429-discovery.4027588060" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.f429-discovery.2109500605" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.f429-discovery.4027588060" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5351,6 +5351,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7275,6 +7280,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7285,6 +7300,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 06f3833da8..913989891a 100644 --- a/firmware/tunerstudio/generated/fome_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/fome_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.frankenso_na6.1609469047" + signature = "rusEFI (FOME) master.2023.10.24.frankenso_na6.3527605526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.frankenso_na6.1609469047" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.frankenso_na6.3527605526" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5351,6 +5351,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7275,6 +7280,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7285,6 +7300,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index 070f7c0403..cf7e9891ba 100644 --- a/firmware/tunerstudio/generated/fome_harley81.ini +++ b/firmware/tunerstudio/generated/fome_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.harley81.4096349383" + signature = "rusEFI (FOME) master.2023.10.24.harley81.2038769062" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.harley81.4096349383" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.harley81.2038769062" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index f1d711a441..5f9d66e59f 100644 --- a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen-gm-e67.349520494" + signature = "rusEFI (FOME) master.2023.10.24.hellen-gm-e67.2574856975" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen-gm-e67.349520494" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen-gm-e67.2574856975" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index b560183019..9c0e607190 100644 --- a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen-honda-k.2403634223" + signature = "rusEFI (FOME) master.2023.10.24.hellen-honda-k.48823630" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen-honda-k.2403634223" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen-honda-k.48823630" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 42ec026ede..5135b08b69 100644 --- a/firmware/tunerstudio/generated/fome_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/fome_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen-nb1.2325445889" + signature = "rusEFI (FOME) master.2023.10.24.hellen-nb1.121048160" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen-nb1.2325445889" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen-nb1.121048160" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index f970df0ec2..2d3b234605 100644 --- a/firmware/tunerstudio/generated/fome_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/fome_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen121nissan.4198551883" + signature = "rusEFI (FOME) master.2023.10.24.hellen121nissan.2011996202" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen121nissan.4198551883" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen121nissan.2011996202" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 41d03dbf92..e1e98f952d 100644 --- a/firmware/tunerstudio/generated/fome_hellen121vag.ini +++ b/firmware/tunerstudio/generated/fome_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen121vag.1447288472" + signature = "rusEFI (FOME) master.2023.10.24.hellen121vag.3689918457" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen121vag.1447288472" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen121vag.3689918457" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen128mercedes.ini b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini index 99611d9704..50133cf1ae 100644 --- a/firmware/tunerstudio/generated/fome_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/fome_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen128.4247653658" + signature = "rusEFI (FOME) master.2023.10.24.hellen128.1887599739" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen128.4247653658" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen128.1887599739" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 51a3c50e3c..c298f960b8 100644 --- a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen154hyundai.1775840763" + signature = "rusEFI (FOME) master.2023.10.24.hellen154hyundai.3832896666" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen154hyundai.1775840763" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen154hyundai.3832896666" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index da33896635..9b82adb778 100644 --- a/firmware/tunerstudio/generated/fome_hellen72.ini +++ b/firmware/tunerstudio/generated/fome_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen72.2349397258" + signature = "rusEFI (FOME) master.2023.10.24.hellen72.27559019" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen72.2349397258" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen72.27559019" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index 774f910922..80f32d96b3 100644 --- a/firmware/tunerstudio/generated/fome_hellen81.ini +++ b/firmware/tunerstudio/generated/fome_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen81.545427336" + signature = "rusEFI (FOME) master.2023.10.24.hellen81.2905538281" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen81.545427336" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen81.2905538281" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5350,6 +5350,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7264,6 +7269,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7274,6 +7289,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index 3bce7a98cc..5af343b78f 100644 --- a/firmware/tunerstudio/generated/fome_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/fome_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellen88bmw.649763003" + signature = "rusEFI (FOME) master.2023.10.24.hellen88bmw.2870405594" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellen88bmw.649763003" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellen88bmw.2870405594" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7263,6 +7268,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7273,6 +7288,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index bd6298b348..a4cb64477b 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA6.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellenNA6.1846291770" + signature = "rusEFI (FOME) master.2023.10.24.hellenNA6.3818937435" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellenNA6.1846291770" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellenNA6.3818937435" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index f06fc0136b..fd4f3d50f5 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.hellenNA8_96.3534248586" + signature = "rusEFI (FOME) master.2023.10.24.hellenNA8_96.1594108907" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.hellenNA8_96.3534248586" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.hellenNA8_96.1594108907" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5352,6 +5352,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index 72c6fd0e68..59945bb7b7 100644 --- a/firmware/tunerstudio/generated/fome_mre_f4.ini +++ b/firmware/tunerstudio/generated/fome_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.mre_f4.2586970373" + signature = "rusEFI (FOME) master.2023.10.24.mre_f4.396261476" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.mre_f4.2586970373" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.mre_f4.396261476" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5354,6 +5354,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7265,6 +7270,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7275,6 +7290,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index ea047109cf..23e09fba9f 100644 --- a/firmware/tunerstudio/generated/fome_mre_f7.ini +++ b/firmware/tunerstudio/generated/fome_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.mre_f7.2586970373" + signature = "rusEFI (FOME) master.2023.10.24.mre_f7.396261476" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.mre_f7.2586970373" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.mre_f7.396261476" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5354,6 +5354,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7265,6 +7270,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7275,6 +7290,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index f975b0d303..5b02f0c0f2 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_405.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.prometheus_405.1294508333" + signature = "rusEFI (FOME) master.2023.10.24.prometheus_405.3229929548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.prometheus_405.1294508333" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.prometheus_405.3229929548" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5346,6 +5346,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7270,6 +7275,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7280,6 +7295,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index 602db1e2b2..66a7228e6d 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_469.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.prometheus_469.1294508333" + signature = "rusEFI (FOME) master.2023.10.24.prometheus_469.3229929548" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.prometheus_469.1294508333" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.prometheus_469.3229929548" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5346,6 +5346,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7270,6 +7275,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7280,6 +7295,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index 5ff3f6c662..3bca6ec38e 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f4.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.proteus_f4.3967987542" + signature = "rusEFI (FOME) master.2023.10.24.proteus_f4.1630461495" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.proteus_f4.3967987542" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.proteus_f4.1630461495" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5348,6 +5348,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7256,6 +7261,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7266,6 +7281,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 54fc2989ab..8feda1ef7e 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.proteus_f7.3967987542" + signature = "rusEFI (FOME) master.2023.10.24.proteus_f7.1630461495" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.proteus_f7.3967987542" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.proteus_f7.1630461495" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5348,6 +5348,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7256,6 +7261,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7266,6 +7281,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index fff226274d..1e7eaf9849 100644 --- a/firmware/tunerstudio/generated/fome_proteus_h7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.proteus_h7.3967987542" + signature = "rusEFI (FOME) master.2023.10.24.proteus_h7.1630461495" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.proteus_h7.3967987542" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.proteus_h7.1630461495" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5348,6 +5348,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7256,6 +7261,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7266,6 +7281,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_small-can-board.ini b/firmware/tunerstudio/generated/fome_small-can-board.ini index 8b8ab21f76..a982ea7644 100644 --- a/firmware/tunerstudio/generated/fome_small-can-board.ini +++ b/firmware/tunerstudio/generated/fome_small-can-board.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.small-can-board.2513468195" + signature = "rusEFI (FOME) master.2023.10.24.small-can-board.410782274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.small-can-board.2513468195" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.small-can-board.410782274" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5350,6 +5350,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7266,6 +7271,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7276,6 +7291,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini index 211339bc17..5c45fc49f4 100644 --- a/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/fome_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.subaru_eg33_f7.4170676786" + signature = "rusEFI (FOME) master.2023.10.24.subaru_eg33_f7.1966803795" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.subaru_eg33_f7.4170676786" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.subaru_eg33_f7.1966803795" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5350,6 +5350,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7274,6 +7279,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7284,6 +7299,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index d329476a0e..94e3fe8347 100644 --- a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2023.10.21.tdg-pdm8.4145168543" + signature = "rusEFI (FOME) master.2023.10.24.tdg-pdm8.2059284990" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2023.10.21.tdg-pdm8.4145168543" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2023.10.24.tdg-pdm8.2059284990" ; 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 @@ -171,7 +171,7 @@ displacement = scalar, U16, 328, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 330, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 332, "", 1, 0, 1, 12, 0 firingOrder = bits, U08, 336, [0:5], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "fo32", "fo33", "fo34", "fo35", "fo36", "fo37" -unusedOldBenchTest = scalar, U08, 337, "", 1, 0, 0, 100, 0 +vvtBumpAmount = scalar, U08, 337, "deg", 1, 0, -30, 30, 0 benchTestOnTime = scalar, U16, 338, "ms", 0.01, 0, 0, 500, 2 cylinderBore = scalar, F32, 340, "mm", 1, 0, 0, 20000, 2 fuelAlgorithm = bits, U08, 344, [0:2], "Speed Density", "MAF Air Charge", "Alpha-N", "Lua" @@ -5351,6 +5351,11 @@ cmd_test_cancel = "Z\x00\x16\x00\x0e" cmd_fuel_pump_on = "Z\x00\x16\x00\x0f" cmd_fuel_pump_off = "Z\x00\x16\x00\x10" +cmd_bump_vvt_target_1 = "Z\x00\x16\x00\x11" +cmd_bump_vvt_target_2 = "Z\x00\x16\x00\x12" +cmd_bump_vvt_target_3 = "Z\x00\x16\x00\x13" +cmd_bump_vvt_target_4 = "Z\x00\x16\x00\x14" + cmd_test_sol1 = "Z\x00\x19\x00\x01" cmd_test_sol2 = "Z\x00\x19\x00\x02" cmd_test_sol3 = "Z\x00\x19\x00\x03" @@ -7275,6 +7280,16 @@ dialog = lambda_monitorDialog, "lambda_monitor" panel = lambdaProtectionLeft, West panel = lambdaProtectionRight, East + dialog = vvtTargetBumping, "VVT Testing" + field = "Pressing the below buttons will move the respective cam's" + field = "target position for 2 seconds for testing and PID tuning" + field = "" + field = "Target bump amount", vvtBumpAmount + commandButton = "VVT target bump bank 1 intake", cmd_bump_vvt_target_1 + commandButton = "VVT target bump bank 1 exhaust", cmd_bump_vvt_target_2 + commandButton = "VVT target bump bank 2 intake", cmd_bump_vvt_target_3 + commandButton = "VVT target bump bank 2 exhaust", cmd_bump_vvt_target_4 + dialog = vvtPidDialog0, "Configuration" field = "Activation Delay", vvtActivationDelayMs field = "Do not control below RPM", vvtControlMinRpm @@ -7285,6 +7300,7 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "PWM frequency", vvtOutputFrequency, {vvtPins1 != 0 || vvtPins2 != 0} field = "VVT solenoid intake cams control direction", invertVvtControlIntake, { vvtPins1 != 0 || vvtPins3 != 0 } field = "VVT solenoid exhaust cams control direction", invertVvtControlExhaust, { vvtPins2 != 0 || vvtPins4 != 0 } + panel = vvtTargetBumping dialog = vvtPidDialog1, "Intake PID" field = "offset", auxPid1_offset, {vvtPins1 != 0} diff --git a/java_console/io/src/main/java/com/rusefi/enums/bench_mode_e.java b/java_console/io/src/main/java/com/rusefi/enums/bench_mode_e.java index c7a5ba8f2b..bb264cc7ba 100644 --- a/java_console/io/src/main/java/com/rusefi/enums/bench_mode_e.java +++ b/java_console/io/src/main/java/com/rusefi/enums/bench_mode_e.java @@ -22,4 +22,8 @@ public enum bench_mode_e { BENCH_CANCEL, BENCH_FUEL_PUMP_ON, BENCH_FUEL_PUMP_OFF, + BENCH_VVT_1_TARGET_BUMP, + BENCH_VVT_2_TARGET_BUMP, + BENCH_VVT_3_TARGET_BUMP, + BENCH_VVT_4_TARGET_BUMP, } 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 e6d73354b6..83c09bd5f4 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 @@ -81,6 +81,10 @@ public class Fields { public static final int bench_mode_e_BENCH_SECOND_IDLE_VALVE = 13; public static final int bench_mode_e_BENCH_STARTER_DISABLE_RELAY = 2; public static final int bench_mode_e_BENCH_STARTER_ENABLE_RELAY = 1; + public static final int bench_mode_e_BENCH_VVT_1_TARGET_BUMP = 17; + public static final int bench_mode_e_BENCH_VVT_2_TARGET_BUMP = 18; + public static final int bench_mode_e_BENCH_VVT_3_TARGET_BUMP = 19; + public static final int bench_mode_e_BENCH_VVT_4_TARGET_BUMP = 20; public static final int blend_table_s_size = 188; public static final int BLOCKING_FACTOR = 750; public static final int BOOST_BLEND_COUNT = 2; @@ -978,7 +982,6 @@ 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 = 564039752; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; public static final int spi_device_e_SPI_DEVICE_3 = 3; @@ -1180,7 +1183,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 (FOME) master.2023.10.21.f407-discovery.564039752"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2023.10.24.f407-discovery.2889015593"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1380; @@ -1323,7 +1326,7 @@ public class Fields { public static final Field TRIGGERSIMULATORRPM = Field.create("TRIGGERSIMULATORRPM", 330, FieldType.INT16).setScale(1.0).setBaseOffset(0); public static final Field CYLINDERSCOUNT = Field.create("CYLINDERSCOUNT", 332, FieldType.INT).setScale(1.0).setBaseOffset(0); public static final Field FIRINGORDER = Field.create("FIRINGORDER", 336, FieldType.INT8).setScale(1.0).setBaseOffset(0); - public static final Field UNUSEDOLDBENCHTEST = Field.create("UNUSEDOLDBENCHTEST", 337, FieldType.INT8).setScale(1.0).setBaseOffset(0); + public static final Field VVTBUMPAMOUNT = Field.create("VVTBUMPAMOUNT", 337, FieldType.INT8).setScale(1.0).setBaseOffset(0); public static final Field BENCHTESTONTIME = Field.create("BENCHTESTONTIME", 338, FieldType.INT16).setScale(0.01).setBaseOffset(0); public static final Field CYLINDERBORE = Field.create("CYLINDERBORE", 340, FieldType.FLOAT).setBaseOffset(0); public static final String[] engine_load_mode_e = {"Speed Density", "MAF Air Charge", "Alpha-N", "Lua"}; @@ -2745,7 +2748,7 @@ public class Fields { TRIGGERSIMULATORRPM, CYLINDERSCOUNT, FIRINGORDER, - UNUSEDOLDBENCHTEST, + VVTBUMPAMOUNT, BENCHTESTONTIME, CYLINDERBORE, FUELALGORITHM,