From 260fa5fdbc23b6bed628894581a33322e8c0b636 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 18 Apr 2022 12:10:05 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 19 ++++++------ .../controllers/algo/rusefi_generated.h | 10 +++--- ...ngine_configuration_generated_structures.h | 19 ++++++------ .../controllers/algo/rusefi_generated.h | 10 +++--- ...ngine_configuration_generated_structures.h | 19 ++++++------ .../controllers/algo/rusefi_generated.h | 10 +++--- ...ngine_configuration_generated_structures.h | 19 ++++++------ .../controllers/generated/rusefi_generated.h | 10 +++--- .../controllers/generated/signature_all.h | 4 +-- .../generated/signature_alphax-2chan.h | 4 +-- .../generated/signature_alphax-4chan.h | 4 +-- .../controllers/generated/signature_atlas.h | 4 +-- .../controllers/generated/signature_core8.h | 4 +-- .../generated/signature_f429-discovery.h | 4 +-- .../generated/signature_frankenso_na6.h | 4 +-- .../generated/signature_harley81.h | 4 +-- .../generated/signature_hellen-nb1.h | 4 +-- .../generated/signature_hellen121nissan.h | 4 +-- .../generated/signature_hellen121vag.h | 4 +-- .../generated/signature_hellen128.h | 4 +-- .../generated/signature_hellen154hyundai.h | 4 +-- .../generated/signature_hellen72.h | 4 +-- .../generated/signature_hellen81.h | 4 +-- .../generated/signature_hellen88bmw.h | 4 +-- .../generated/signature_hellenNA6.h | 4 +-- .../generated/signature_hellenNA8_96.h | 4 +-- .../generated/signature_hellen_cypress.h | 4 +-- .../controllers/generated/signature_kin.h | 4 +-- .../controllers/generated/signature_mre_f4.h | 4 +-- .../controllers/generated/signature_mre_f7.h | 4 +-- .../generated/signature_prometheus_405.h | 4 +-- .../generated/signature_prometheus_469.h | 4 +-- .../generated/signature_proteus_f4.h | 4 +-- .../generated/signature_proteus_f7.h | 4 +-- .../generated/signature_proteus_h7.h | 4 +-- .../generated/signature_subaru_eg33_f7.h | 4 +-- .../generated/signature_tdg-pdm8.h | 4 +-- firmware/tunerstudio/generated/rusefi.ini | 31 +++++++------------ .../generated/rusefi_alphax-2chan.ini | 31 +++++++------------ .../generated/rusefi_alphax-4chan.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_atlas.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_core8.ini | 31 +++++++------------ .../generated/rusefi_f429-discovery.ini | 31 +++++++------------ .../generated/rusefi_frankenso_na6.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_harley81.ini | 31 +++++++------------ .../generated/rusefi_hellen-nb1.ini | 31 +++++++------------ .../generated/rusefi_hellen121nissan.ini | 31 +++++++------------ .../generated/rusefi_hellen121vag.ini | 31 +++++++------------ .../generated/rusefi_hellen128mercedes.ini | 31 +++++++------------ .../generated/rusefi_hellen154hyundai.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_hellen72.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_hellen81.ini | 31 +++++++------------ .../generated/rusefi_hellen88bmw.ini | 31 +++++++------------ .../generated/rusefi_hellenNA6.ini | 31 +++++++------------ .../generated/rusefi_hellenNA8_96.ini | 31 +++++++------------ .../generated/rusefi_hellen_cypress.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_kinetis.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_mre_f4.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_mre_f7.ini | 31 +++++++------------ .../generated/rusefi_prometheus_405.ini | 31 +++++++------------ .../generated/rusefi_prometheus_469.ini | 31 +++++++------------ .../generated/rusefi_proteus_f4.ini | 31 +++++++------------ .../generated/rusefi_proteus_f7.ini | 31 +++++++------------ .../generated/rusefi_proteus_h7.ini | 31 +++++++------------ .../generated/rusefi_subaru_eg33_f7.ini | 31 +++++++------------ .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 31 +++++++------------ .../com/rusefi/config/generated/Fields.java | 19 ++++++------ .../rusefi/config/generated/TsOutputs.java | 4 +-- java_console/rusefi.xml | 12 +------ 69 files changed, 446 insertions(+), 720 deletions(-) diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 849d3fe0d8..87d7853658 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Apr 17 20:27:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:56 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -732,16 +732,14 @@ struct engine_configuration_s { */ uint8_t maxAcClt; /** - * Knock sensor output knock detection threshold depending on current RPM - v + RPM * offset 12 */ - float knockNoise[ENGINE_NOISE_CURVE_SIZE]; - /** - RPM - * offset 44 - */ scaled_channel knockNoiseRpmBins[ENGINE_NOISE_CURVE_SIZE]; + /** + * offset 28 + */ + uint8_t unused28[24]; /** * This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC. deg @@ -3920,10 +3918,11 @@ struct engine_configuration_s { */ pin_output_mode_e tcu_solenoid_mode[TCU_SOLENOID_COUNT]; /** + * Knock sensor output knock detection threshold depending on current RPM. dB * offset 3991 */ - int8_t knockBaseNoise[IGN_RPM_COUNT]; + scaled_channel knockBaseNoise[ENGINE_NOISE_CURVE_SIZE]; /** * need 4 byte alignment units @@ -4582,4 +4581,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21012); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Apr 17 20:27:57 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:56 UTC 2022 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index ecefef94c9..9585b440e5 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -820,7 +820,7 @@ #define ENGINE_MAKE_SUBARU "Subaru" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_VAG "VAG" -#define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_NOISE_CURVE_SIZE 16 #define ENGINE_SNIFFER_UNIT_US 10 #define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102" #define engine_type_e_BMW_M73_M 24 @@ -1588,8 +1588,7 @@ #define knockBaseNoise_offset 3991 #define knockDetectionWindowEnd_offset 1296 #define knockDetectionWindowStart_offset 1292 -#define knockNoise_offset 12 -#define knockNoiseRpmBins_offset 44 +#define knockNoiseRpmBins_offset 12 #define knockRetardAggression_offset 620 #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 @@ -1950,7 +1949,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 4145065306 +#define SIGNATURE_HASH 91346245 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2508,7 +2507,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen_cypress.4145065306" +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen_cypress.91346245" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2554,6 +2553,7 @@ #define unused1740b2_offset 1740 #define unused17440_offset 17440 #define unused184_offset 184 +#define unused28_offset 28 #define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index ee25c74fc4..4da446c06a 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Apr 17 20:27:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:55 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -732,16 +732,14 @@ struct engine_configuration_s { */ uint8_t maxAcClt; /** - * Knock sensor output knock detection threshold depending on current RPM - v + RPM * offset 12 */ - float knockNoise[ENGINE_NOISE_CURVE_SIZE]; - /** - RPM - * offset 44 - */ scaled_channel knockNoiseRpmBins[ENGINE_NOISE_CURVE_SIZE]; + /** + * offset 28 + */ + uint8_t unused28[24]; /** * This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC. deg @@ -3914,10 +3912,11 @@ struct engine_configuration_s { */ pin_output_mode_e tcu_solenoid_mode[TCU_SOLENOID_COUNT]; /** + * Knock sensor output knock detection threshold depending on current RPM. dB * offset 3963 */ - int8_t knockBaseNoise[IGN_RPM_COUNT]; + scaled_channel knockBaseNoise[ENGINE_NOISE_CURVE_SIZE]; /** * need 4 byte alignment units @@ -4576,4 +4575,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 20984); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Apr 17 20:27:56 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:55 UTC 2022 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 839da081c4..fec8c0b219 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -805,7 +805,7 @@ #define ENGINE_MAKE_SUBARU "Subaru" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_VAG "VAG" -#define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_NOISE_CURVE_SIZE 16 #define ENGINE_SNIFFER_UNIT_US 10 #define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102" #define engine_type_e_BMW_M73_M 24 @@ -1573,8 +1573,7 @@ #define knockBaseNoise_offset 3963 #define knockDetectionWindowEnd_offset 1296 #define knockDetectionWindowStart_offset 1292 -#define knockNoise_offset 12 -#define knockNoiseRpmBins_offset 44 +#define knockNoiseRpmBins_offset 12 #define knockRetardAggression_offset 620 #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 @@ -1935,7 +1934,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 146104742 +#define SIGNATURE_HASH 4208204217 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2493,7 +2492,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.18.kin.146104742" +#define TS_SIGNATURE "rusEFI 2022.04.18.kin.4208204217" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2539,6 +2538,7 @@ #define unused1740b2_offset 1740 #define unused17440_offset 17412 #define unused184_offset 184 +#define unused28_offset 28 #define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 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 516725343b..1c63e52552 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 @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sun Apr 17 20:27:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:57 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -732,16 +732,14 @@ struct engine_configuration_s { */ uint8_t maxAcClt; /** - * Knock sensor output knock detection threshold depending on current RPM - v + RPM * offset 12 */ - float knockNoise[ENGINE_NOISE_CURVE_SIZE]; - /** - RPM - * offset 44 - */ scaled_channel knockNoiseRpmBins[ENGINE_NOISE_CURVE_SIZE]; + /** + * offset 28 + */ + uint8_t unused28[24]; /** * This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC. deg @@ -3920,10 +3918,11 @@ struct engine_configuration_s { */ pin_output_mode_e tcu_solenoid_mode[TCU_SOLENOID_COUNT]; /** + * Knock sensor output knock detection threshold depending on current RPM. dB * offset 3991 */ - int8_t knockBaseNoise[IGN_RPM_COUNT]; + scaled_channel knockBaseNoise[ENGINE_NOISE_CURVE_SIZE]; /** * need 4 byte alignment units @@ -4582,4 +4581,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21012); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Sun Apr 17 20:27:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:57 UTC 2022 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 61f36944d8..f495aee72e 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 @@ -798,7 +798,7 @@ #define ENGINE_MAKE_SUBARU "Subaru" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_VAG "VAG" -#define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_NOISE_CURVE_SIZE 16 #define ENGINE_SNIFFER_UNIT_US 10 #define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102" #define engine_type_e_BMW_M73_M 24 @@ -1566,8 +1566,7 @@ #define knockBaseNoise_offset 3991 #define knockDetectionWindowEnd_offset 1296 #define knockDetectionWindowStart_offset 1292 -#define knockNoise_offset 12 -#define knockNoiseRpmBins_offset 44 +#define knockNoiseRpmBins_offset 12 #define knockRetardAggression_offset 620 #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 @@ -1929,7 +1928,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 2891066215 +#define SIGNATURE_HASH 1580422008 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2487,7 +2486,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2022.04.18.subaru_eg33_f7.2891066215" +#define TS_SIGNATURE "rusEFI 2022.04.18.subaru_eg33_f7.1580422008" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2533,6 +2532,7 @@ #define unused1740b2_offset 1740 #define unused17440_offset 17440 #define unused184_offset 184 +#define unused28_offset 28 #define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 1158855b68..d9f908f19f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Apr 17 20:28:00 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:59 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -732,16 +732,14 @@ struct engine_configuration_s { */ uint8_t maxAcClt; /** - * Knock sensor output knock detection threshold depending on current RPM - v + RPM * offset 12 */ - float knockNoise[ENGINE_NOISE_CURVE_SIZE]; - /** - RPM - * offset 44 - */ scaled_channel knockNoiseRpmBins[ENGINE_NOISE_CURVE_SIZE]; + /** + * offset 28 + */ + uint8_t unused28[24]; /** * This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC. deg @@ -3920,10 +3918,11 @@ struct engine_configuration_s { */ pin_output_mode_e tcu_solenoid_mode[TCU_SOLENOID_COUNT]; /** + * Knock sensor output knock detection threshold depending on current RPM. dB * offset 3991 */ - int8_t knockBaseNoise[IGN_RPM_COUNT]; + scaled_channel knockBaseNoise[ENGINE_NOISE_CURVE_SIZE]; /** * need 4 byte alignment units @@ -4582,4 +4581,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 21012); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Apr 17 20:28:00 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:59 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 091e82f132..43c600e11a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -820,7 +820,7 @@ #define ENGINE_MAKE_SUBARU "Subaru" #define ENGINE_MAKE_TOYOTA "Toyota" #define ENGINE_MAKE_VAG "VAG" -#define ENGINE_NOISE_CURVE_SIZE 8 +#define ENGINE_NOISE_CURVE_SIZE 16 #define ENGINE_SNIFFER_UNIT_US 10 #define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "PROTEUS_HARLEY", "FORD_INLINE_6_1995", "GY6_139QMB", "PROTEUS_E65_6H_MAN_IN_THE_MIDDLE", "HELLEN_NA8_96", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "TEST_33816", "TEST_ROTARY", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "TEST_CRANK_ENGINE", "SACHS", "PROTEUS_ANALOG_PWM_TEST", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "L9779_BENCH_ENGINE", "EEPROM_BENCH_ENGINE", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "TEST_100", "TEST_101", "TEST_102" #define engine_type_e_BMW_M73_M 24 @@ -1588,8 +1588,7 @@ #define knockBaseNoise_offset 3991 #define knockDetectionWindowEnd_offset 1296 #define knockDetectionWindowStart_offset 1292 -#define knockNoise_offset 12 -#define knockNoiseRpmBins_offset 44 +#define knockNoiseRpmBins_offset 12 #define knockRetardAggression_offset 620 #define knockRetardMaximum_offset 622 #define knockRetardReapplyRate_offset 621 @@ -1950,7 +1949,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 896 -#define SIGNATURE_HASH 3454356198 +#define SIGNATURE_HASH 1079876431 #define silentTriggerError_offset 1260 #define skippedWheelOnCam_offset 1260 #define slowAdcAlpha_offset 1712 @@ -2508,7 +2507,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2022.04.18.all.3454356198" +#define TS_SIGNATURE "rusEFI 2022.04.18.all.1079876431" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2554,6 +2553,7 @@ #define unused1740b2_offset 1740 #define unused17440_offset 17440 #define unused184_offset 184 +#define unused28_offset 28 #define unused722_offset 722 #define unused_1484_bit_24_offset 1272 #define unused_1484_bit_25_offset 1272 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 0ab40d057e..15f8915335 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3454356198 -#define TS_SIGNATURE "rusEFI 2022.04.18.all.3454356198" +#define SIGNATURE_HASH 1079876431 +#define TS_SIGNATURE "rusEFI 2022.04.18.all.1079876431" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index f90aa27289..9412bd23bd 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3502675897 -#define TS_SIGNATURE "rusEFI 2022.04.18.alphax-2chan.3502675897" +#define SIGNATURE_HASH 1568556560 +#define TS_SIGNATURE "rusEFI 2022.04.18.alphax-2chan.1568556560" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index e1c1200990..493f04a427 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1146524946 -#define TS_SIGNATURE "rusEFI 2022.04.18.alphax-4chan.1146524946" +#define SIGNATURE_HASH 3387835579 +#define TS_SIGNATURE "rusEFI 2022.04.18.alphax-4chan.3387835579" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 17e48d38fc..cd600f32bb 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3509567425 -#define TS_SIGNATURE "rusEFI 2022.04.18.atlas.3509567425" +#define SIGNATURE_HASH 1553428072 +#define TS_SIGNATURE "rusEFI 2022.04.18.atlas.1553428072" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 2ac4265d76..5a47a5a29c 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3772433292 -#define TS_SIGNATURE "rusEFI 2022.04.18.core8.3772433292" +#define SIGNATURE_HASH 1835143717 +#define TS_SIGNATURE "rusEFI 2022.04.18.core8.1835143717" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 977f6779e7..f555797aa2 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3454356198 -#define TS_SIGNATURE "rusEFI 2022.04.18.f429-discovery.3454356198" +#define SIGNATURE_HASH 1079876431 +#define TS_SIGNATURE "rusEFI 2022.04.18.f429-discovery.1079876431" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1311949c06..ad12c11e63 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2755449559 -#define TS_SIGNATURE "rusEFI 2022.04.18.frankenso_na6.2755449559" +#define SIGNATURE_HASH 696517502 +#define TS_SIGNATURE "rusEFI 2022.04.18.frankenso_na6.696517502" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index fe48b7f90d..cdad2e3e06 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2596003315 -#define TS_SIGNATURE "rusEFI 2022.04.18.harley81.2596003315" +#define SIGNATURE_HASH 386075738 +#define TS_SIGNATURE "rusEFI 2022.04.18.harley81.386075738" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 99ce714f07..12d714fca1 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2269102203 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen-nb1.2269102203" +#define SIGNATURE_HASH 176624082 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen-nb1.176624082" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index c7fb3f8ec0..c4e3ea3048 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2421320856 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen121nissan.2421320856" +#define SIGNATURE_HASH 501923121 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen121nissan.501923121" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 35baef0a7d..3ed21f6755 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2477531505 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen121vag.2477531505" +#define SIGNATURE_HASH 504688856 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen121vag.504688856" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 830d08379a..e9f0e2da62 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3547811723 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen128.3547811723" +#define SIGNATURE_HASH 1590664738 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen128.1590664738" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 9d3c97daac..61309bb1ca 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 335567814 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen154hyundai.335567814" +#define SIGNATURE_HASH 2579008111 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen154hyundai.2579008111" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 9dd2f6e82e..c7eb9fad46 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 682849670 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen72.682849670" +#define SIGNATURE_HASH 2769003567 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen72.2769003567" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 23e91c6a17..b5604f6dee 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1280521824 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen81.1280521824" +#define SIGNATURE_HASH 3253462985 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen81.3253462985" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 89b044ec22..ba2a9ee4d1 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3317212091 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen88bmw.3317212091" +#define SIGNATURE_HASH 1207988754 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen88bmw.1207988754" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 04f3337ca0..774497143c 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1765999243 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellenNA6.1765999243" +#define SIGNATURE_HASH 3841708834 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellenNA6.3841708834" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index f613d1077c..88c3c17eca 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3243436402 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellenNA8_96.3243436402" +#define SIGNATURE_HASH 1290418395 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellenNA8_96.1290418395" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 3db251ea9f..b7fd2665d0 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 4145065306 -#define TS_SIGNATURE "rusEFI 2022.04.18.hellen_cypress.4145065306" +#define SIGNATURE_HASH 91346245 +#define TS_SIGNATURE "rusEFI 2022.04.18.hellen_cypress.91346245" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 18163be05d..ab64115216 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat null // -#define SIGNATURE_HASH 146104742 -#define TS_SIGNATURE "rusEFI 2022.04.18.kin.146104742" +#define SIGNATURE_HASH 4208204217 +#define TS_SIGNATURE "rusEFI 2022.04.18.kin.4208204217" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index e7602f5b26..4c517ac318 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2730853517 -#define TS_SIGNATURE "rusEFI 2022.04.18.mre_f4.2730853517" +#define SIGNATURE_HASH 796742948 +#define TS_SIGNATURE "rusEFI 2022.04.18.mre_f4.796742948" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index b9637df230..8d60c65f01 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2730853517 -#define TS_SIGNATURE "rusEFI 2022.04.18.mre_f7.2730853517" +#define SIGNATURE_HASH 796742948 +#define TS_SIGNATURE "rusEFI 2022.04.18.mre_f7.796742948" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 83e6e7f3fd..68a1834a87 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2635043584 -#define TS_SIGNATURE "rusEFI 2022.04.18.prometheus_405.2635043584" +#define SIGNATURE_HASH 280445609 +#define TS_SIGNATURE "rusEFI 2022.04.18.prometheus_405.280445609" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index b98384037c..ca2cb5d8ea 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2635043584 -#define TS_SIGNATURE "rusEFI 2022.04.18.prometheus_469.2635043584" +#define SIGNATURE_HASH 280445609 +#define TS_SIGNATURE "rusEFI 2022.04.18.prometheus_469.280445609" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2c9f7bf127..80342481a6 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3946632039 -#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_f4.3946632039" +#define SIGNATURE_HASH 1719927502 +#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_f4.1719927502" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index df3c6fdd84..aa31838038 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3946632039 -#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_f7.3946632039" +#define SIGNATURE_HASH 1719927502 +#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_f7.1719927502" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 64cb86be94..0d7c65ada0 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3946632039 -#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_h7.3946632039" +#define SIGNATURE_HASH 1719927502 +#define TS_SIGNATURE "rusEFI 2022.04.18.proteus_h7.1719927502" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 5075dd2f4f..6631254e96 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh null // -#define SIGNATURE_HASH 2891066215 -#define TS_SIGNATURE "rusEFI 2022.04.18.subaru_eg33_f7.2891066215" +#define SIGNATURE_HASH 1580422008 +#define TS_SIGNATURE "rusEFI 2022.04.18.subaru_eg33_f7.1580422008" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index a6dd08e493..d04de3ad16 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 569639607 -#define TS_SIGNATURE "rusEFI 2022.04.18.tdg-pdm8.569639607" +#define SIGNATURE_HASH 2890715934 +#define TS_SIGNATURE "rusEFI 2022.04.18.tdg-pdm8.2890715934" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index edc569d999..76bcc63d0b 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.all.3454356198" + signature = "rusEFI 2022.04.18.all.1079876431" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.all.3454356198" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.all.1079876431" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:16 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:54 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5898,7 +5889,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index c11cf00df6..19635d8caf 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.alphax-2chan.3502675897" + signature = "rusEFI 2022.04.18.alphax-2chan.1568556560" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.alphax-2chan.3502675897" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.alphax-2chan.1568556560" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:47 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:24 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5879,7 +5870,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index c2197feeb9..1251c538b4 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.alphax-4chan.1146524946" + signature = "rusEFI 2022.04.18.alphax-4chan.3387835579" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.alphax-4chan.1146524946" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.alphax-4chan.3387835579" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:49 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:25 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5880,7 +5871,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index fd8364f77e..cadd4295d0 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.atlas.3509567425" + signature = "rusEFI 2022.04.18.atlas.1553428072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.atlas.3509567425" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.atlas.1553428072" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:52 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5890,7 +5881,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 086fa781a7..038057d3ab 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.core8.3772433292" + signature = "rusEFI 2022.04.18.core8.1835143717" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.core8.3772433292" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.core8.1835143717" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:42 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5893,7 +5884,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index ee60d803cc..59c040dd9c 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.f429-discovery.3454356198" + signature = "rusEFI 2022.04.18.f429-discovery.1079876431" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.f429-discovery.3454356198" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.f429-discovery.1079876431" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:51 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5898,7 +5889,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7a454c430f..bc71f9620f 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.frankenso_na6.2755449559" + signature = "rusEFI 2022.04.18.frankenso_na6.696517502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.frankenso_na6.2755449559" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.frankenso_na6.696517502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:44 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5898,7 +5889,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 3027cf1c69..7737a48296 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.harley81.2596003315" + signature = "rusEFI 2022.04.18.harley81.386075738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.harley81.2596003315" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.harley81.386075738" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:26 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 6a66aa9b24..9f73ca389d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen-nb1.2269102203" + signature = "rusEFI 2022.04.18.hellen-nb1.176624082" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen-nb1.2269102203" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen-nb1.176624082" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:59 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:36 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2de1cfbcda..353667d1de 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen121nissan.2421320856" + signature = "rusEFI 2022.04.18.hellen121nissan.501923121" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen121nissan.2421320856" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen121nissan.501923121" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:53 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:30 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 4c99b07286..e3a04b765c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen121vag.2477531505" + signature = "rusEFI 2022.04.18.hellen121vag.504688856" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen121vag.2477531505" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen121vag.504688856" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:29 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 8132414bc9..fc246b2211 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen128.3547811723" + signature = "rusEFI 2022.04.18.hellen128.1590664738" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen128.3547811723" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen128.1590664738" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:28 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 068e089326..dcb8e3b85f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen154hyundai.335567814" + signature = "rusEFI 2022.04.18.hellen154hyundai.2579008111" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen154hyundai.335567814" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen154hyundai.2579008111" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:31 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index c96fba6630..c0b3d1f5ab 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen72.682849670" + signature = "rusEFI 2022.04.18.hellen72.2769003567" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen72.682849670" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen72.2769003567" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:57 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:34 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 68b276bfe2..cd6e17cffb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen81.1280521824" + signature = "rusEFI 2022.04.18.hellen81.3253462985" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen81.1280521824" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen81.3253462985" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:35 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5881,7 +5872,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 527efecd6d..470f4fe37b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen88bmw.3317212091" + signature = "rusEFI 2022.04.18.hellen88bmw.1207988754" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen88bmw.3317212091" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen88bmw.1207988754" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:06:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:33 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 423882e20a..fc6601ce97 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellenNA6.1765999243" + signature = "rusEFI 2022.04.18.hellenNA6.3841708834" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellenNA6.1765999243" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellenNA6.3841708834" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:38 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 2486a0a4df..f0563e50fd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellenNA8_96.3243436402" + signature = "rusEFI 2022.04.18.hellenNA8_96.1290418395" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellenNA8_96.3243436402" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellenNA8_96.1290418395" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:01 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:39 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 57d959ef1d..7065a07c44 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.hellen_cypress.4145065306" + signature = "rusEFI 2022.04.18.hellen_cypress.91346245" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.hellen_cypress.4145065306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.hellen_cypress.91346245" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 06:07:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:56 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5898,7 +5889,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 044e998161..2a0802e860 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.kin.146104742" + signature = "rusEFI 2022.04.18.kin.4208204217" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.kin.146104742" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.kin.4208204217" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 06:07:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 12:07:55 UTC 2022 pageSize = 20984 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1162,7 +1162,7 @@ tcu_solenoid_mode3 = bits, U08, 3959, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3960, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3961, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3962, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3963, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3963, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_3979 = scalar, U08, 3979, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 3980, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 3984, "from", 1, 0, 0, 20, 2 @@ -1394,7 +1394,6 @@ crankingFuelCoefE100 = array, U16, 20968, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1820,6 +1819,7 @@ crankingFuelCoefE100 = array, U16, 20968, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_3979 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2905,20 +2905,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3644,8 +3635,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3808,7 +3797,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5865,7 +5856,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 9911d1dfc1..55b16bdc78 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.mre_f4.2730853517" + signature = "rusEFI 2022.04.18.mre_f4.796742948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.mre_f4.2730853517" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.mre_f4.796742948" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:41 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 13d3c60b0f..c8d8fe5dc8 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.mre_f7.2730853517" + signature = "rusEFI 2022.04.18.mre_f7.796742948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.mre_f7.2730853517" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.mre_f7.796742948" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:40 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5882,7 +5873,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ccd4c9d48d..359e0d3f57 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.prometheus_405.2635043584" + signature = "rusEFI 2022.04.18.prometheus_405.280445609" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.prometheus_405.2635043584" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.prometheus_405.280445609" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:46 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5893,7 +5884,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index a077ee3d45..66797573d3 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.prometheus_469.2635043584" + signature = "rusEFI 2022.04.18.prometheus_469.280445609" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.prometheus_469.2635043584" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.prometheus_469.280445609" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:07 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:45 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5893,7 +5884,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 9a9a25d5c0..2d864ca56a 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.proteus_f4.3946632039" + signature = "rusEFI 2022.04.18.proteus_f4.1719927502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.proteus_f4.3946632039" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.proteus_f4.1719927502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:10 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:48 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5875,7 +5866,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 9ccb06f506..323aa12d2e 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.proteus_f7.3946632039" + signature = "rusEFI 2022.04.18.proteus_f7.1719927502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.proteus_f7.3946632039" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.proteus_f7.1719927502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:47 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5875,7 +5866,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 7902c7865a..807d7b1f16 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.proteus_h7.3946632039" + signature = "rusEFI 2022.04.18.proteus_h7.1719927502" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.proteus_h7.3946632039" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.proteus_h7.1719927502" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:50 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5875,7 +5866,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 694b0721ac..00da3f57cf 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.subaru_eg33_f7.2891066215" + signature = "rusEFI 2022.04.18.subaru_eg33_f7.1580422008" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.subaru_eg33_f7.2891066215" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.subaru_eg33_f7.1580422008" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:57 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5892,7 +5883,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 6c5aa18349..c782bcb741 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.04.18.tdg-pdm8.569639607" + signature = "rusEFI 2022.04.18.tdg-pdm8.2890715934" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2022.04.18.tdg-pdm8.569639607" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.04.18.tdg-pdm8.2890715934" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:53 UTC 2022 pageSize = 21012 page = 1 @@ -97,8 +97,8 @@ multisparkMaxRpm = scalar, U08, 8, "rpm", 50.0, 0, 0, 3000, 0 maxAcRpm = scalar, U08, 9, "rpm", 50.0, 0, 0, 10000, 0 maxAcTps = scalar, U08, 10, "%", 1, 0, 0, 100, 0 maxAcClt = scalar, U08, 11, "deg C", 1, 0, 0, 150, 0 -knockNoise = array, F32, 12, [8], "v", 1, 0, 0, 10, 2 -knockNoiseRpmBins = array, U08, 44, [8], "RPM", 50.0, 0, 0, 18000, 2 +knockNoiseRpmBins = array, U08, 12, [16], "RPM", 50.0, 0, 0, 18000, 2 +unused28 = array, U08, 28, [24], "", 1, 0, 0, 0, 0 multisparkMaxSparkingAngle = scalar, U08, 52, "deg", 1, 0, 0, 60, 0 multisparkMaxExtraSparkCount = scalar, U08, 53, "count", 1, 0, 1, 5, 0 sparkDwellRpmBins = array, U08, 54, [8], "RPM", 50.0, 0, 0, 18000, 2 @@ -1184,7 +1184,7 @@ tcu_solenoid_mode3 = bits, U08, 3987, [0:1], "default", "default inverted", "ope tcu_solenoid_mode4 = bits, U08, 3988, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode5 = bits, U08, 3989, [0:1], "default", "default inverted", "open collector", "open collector inverted" tcu_solenoid_mode6 = bits, U08, 3990, [0:1], "default", "default inverted", "open collector", "open collector inverted" -knockBaseNoise = array, S08, 3991, [16], "dB", 1, 0, -30, 0, 2 +knockBaseNoise = array, S08, 3991, [16], "dB", 0.5, 0, -50, 10, 1 alignmentFill_at_4007 = scalar, U08, 4007, "units", 1, 0, -20, 100, 0 triggerGapOverrideFrom1 = scalar, F32, 4008, "from", 1, 0, 0, 20, 2 triggerGapOverrideFrom2 = scalar, F32, 4012, "from", 1, 0, 0, 20, 2 @@ -1416,7 +1416,6 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 maxAcRpm = "Above this RPM, disable AC. Set to 0 to disable check." maxAcTps = "Above this TPS, disable AC. Set to 0 to disable check." maxAcClt = "Above this CLT, disable AC to prevent overheating the engine. Set to 0 to disable check." - knockNoise = "Knock sensor output knock detection threshold depending on current RPM" multisparkMaxSparkingAngle = "This parameter sets the latest that the last multispark can occur after the main ignition event. For example, if the ignition timing is 30 degrees BTDC, and this parameter is set to 45, no multispark will ever be fired after 15 degrees ATDC." multisparkMaxExtraSparkCount = "Configures the maximum number of extra sparks to fire (does not include main spark)" sparkDwellRpmBins = "On Single Coil or Wasted Spark setups you have to lower dwell at high RPM" @@ -1854,6 +1853,7 @@ crankingFuelCoefE100 = array, U16, 20996, [8], "ratio", 0.01, 0, 0, 50, 2 gppwm4_onAboveDuty = "Hysteresis: in on-off mode, turn the output on when the table value is above this duty." gppwm4_offBelowDuty = "Hysteresis: in on-off mode, turn the output off when the table value is below this duty." gppwm4_loadAxis = "Selects the load axis to use for the table." + knockBaseNoise = "Knock sensor output knock detection threshold depending on current RPM." alignmentFill_at_4007 = "need 4 byte alignment" hpfpPeakPos = "Crank angle ATDC of first lobe peak" hpfpMinAngle = "If the requested activation time is below this angle, don't bother running the pump" @@ -2939,20 +2939,11 @@ luaAdjustment = scalar, F32, 996, "", 1, 0 ; xAxis = leftValue, rightValue, step ; yAxis = bottomValue, topValue, step - curve = knockThresholdCurve, "Engine knock threshold RPM based" columnLabel = "RPM", "Threshold" xAxis = 0, 8000, 9 yAxis = 0, 8, 10 xBins = knockNoiseRpmBins, RPMValue - yBins = knockNoise - gauge = RPMGauge - - curve = swKnockThresholdCurve, "Engine knock threshold RPM based" - columnLabel = "RPM", "Threshold dB" - xAxis = 0, 8000, 9 - yAxis = -30, 0, 10 - xBins = ignitionRpmBins, RPMValue yBins = knockBaseNoise gauge = RPMGauge @@ -3678,8 +3669,6 @@ gaugeCategory = Sensors - Extra 2 egt7Gauge = egt7, "EGT#7", "C", 0, 2000 egt8Gauge = egt8, "EGT#8", "C", 0, 2000 rpmAccelerationGa = rpmAcceleration, "rpm delta", "RPM/s", -2000, 2000, -2000, 2000, -2000, 2000, 0, 0 - knockLevelGauge = knockLevel,"Knock level", "V", 0, 7, 10, 10, 100, 100, 1, 2 - knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0, 100, 10, 20, 100, 100, 1, 1 wastegatePosGauge = wastegatePositionSensor, "Wastegate position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 idlePosSensGauge = idlePositionSensor, "Idle position sensor", "%", 0, 100, 0, 0, 100, 100, 1, 1 @@ -3842,7 +3831,9 @@ gaugeCategory = Knock knock10Gauge = knock10, "Knock Cyl 10", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock11Gauge = knock11, "Knock Cyl 11", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 knock12Gauge = knock12, "Knock Cyl 12", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 - knockRetardGauge = knockRetard, "Knock Retard", "deg", 0, 10, 0, 0, 10, 10, 0, 1, 0 + knockLevelGauge = knockLevel,"Knock level", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knockRetardGauge = knockRetard, "Knock retard", "deg", 0, 10, 0, 0, 10, 10, 1, 1 + knockCountGauge = knockCount, "Knock count", "count", 0, 10000, 0, 0, 10000, 10000, 0, 0 gaugeCategory = DynoView accelGauge = VssAcceleration, "Vehicle acceleration", "m/s2", -10, 10, -6, -4, 4, 6, 2, 2 @@ -5898,7 +5889,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock", border panel = softwareKnockCfg, West - panel = swKnockThresholdCurve, Center + panel = knockThresholdCurve, Center ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" 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 a07c1e08e7..fcd44299e3 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 06:07:21 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 12:07:59 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -791,7 +791,7 @@ public class Fields { public static final String ENGINE_MAKE_SUBARU = "Subaru"; public static final String ENGINE_MAKE_TOYOTA = "Toyota"; public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 8; + public static final int ENGINE_NOISE_CURVE_SIZE = 16; public static final int ENGINE_SNIFFER_UNIT_US = 10; public static final int engine_type_e_BMW_M73_M = 24; public static final int engine_type_e_BMW_M73_MRE = 50; @@ -1538,8 +1538,7 @@ public class Fields { public static final int knockBaseNoise_offset = 3991; public static final int knockDetectionWindowEnd_offset = 1296; public static final int knockDetectionWindowStart_offset = 1292; - public static final int knockNoise_offset = 12; - public static final int knockNoiseRpmBins_offset = 44; + public static final int knockNoiseRpmBins_offset = 12; public static final int knockRetardAggression_offset = 620; public static final int knockRetardMaximum_offset = 622; public static final int knockRetardReapplyRate_offset = 621; @@ -1876,6 +1875,7 @@ public class Fields { public static final int servoOutputPins7_offset = 2738; public static final int servoOutputPins8_offset = 2739; public static final int showHumanReadableWarning_offset = 896; + public static final int SIGNATURE_HASH = 1079876431; public static final int silentTriggerError_offset = 1260; public static final int skippedWheelOnCam_offset = 1260; public static final int slowAdcAlpha_offset = 1712; @@ -2371,7 +2371,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2022.04.18.all.3454356198"; + public static final String TS_SIGNATURE = "rusEFI 2022.04.18.all.1079876431"; 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 = 1000; @@ -2414,6 +2414,7 @@ public class Fields { public static final int unused1740b2_offset = 1740; public static final int unused17440_offset = 17440; public static final int unused184_offset = 184; + public static final int unused28_offset = 28; public static final int unused722_offset = 722; public static final int unused_1484_bit_24_offset = 1272; public static final int unused_1484_bit_25_offset = 1272; @@ -2583,8 +2584,8 @@ public class Fields { public static final Field MAXACRPM = Field.create("MAXACRPM", 9, FieldType.INT8).setScale(50.0); public static final Field MAXACTPS = Field.create("MAXACTPS", 10, FieldType.INT8).setScale(1.0); public static final Field MAXACCLT = Field.create("MAXACCLT", 11, FieldType.INT8).setScale(1.0); - public static final Field KNOCKNOISE = Field.create("KNOCKNOISE", 12, FieldType.FLOAT); - public static final Field KNOCKNOISERPMBINS = Field.create("KNOCKNOISERPMBINS", 44, FieldType.INT8).setScale(50.0); + public static final Field KNOCKNOISERPMBINS = Field.create("KNOCKNOISERPMBINS", 12, FieldType.INT8).setScale(50.0); + public static final Field UNUSED28 = Field.create("UNUSED28", 28, FieldType.INT8).setScale(1.0); public static final Field MULTISPARKMAXSPARKINGANGLE = Field.create("MULTISPARKMAXSPARKINGANGLE", 52, FieldType.INT8).setScale(1.0); public static final Field MULTISPARKMAXEXTRASPARKCOUNT = Field.create("MULTISPARKMAXEXTRASPARKCOUNT", 53, FieldType.INT8).setScale(1.0); public static final Field SPARKDWELLRPMBINS = Field.create("SPARKDWELLRPMBINS", 54, FieldType.INT8).setScale(50.0); @@ -3693,7 +3694,7 @@ public class Fields { public static final Field TCU_SOLENOID_MODE4 = Field.create("TCU_SOLENOID_MODE4", 3988, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field TCU_SOLENOID_MODE5 = Field.create("TCU_SOLENOID_MODE5", 3989, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field TCU_SOLENOID_MODE6 = Field.create("TCU_SOLENOID_MODE6", 3990, FieldType.INT8, pin_output_mode_e).setScale(1.0); - public static final Field KNOCKBASENOISE = Field.create("KNOCKBASENOISE", 3991, FieldType.INT8).setScale(1.0); + public static final Field KNOCKBASENOISE = Field.create("KNOCKBASENOISE", 3991, FieldType.INT8).setScale(0.5); public static final Field ALIGNMENTFILL_AT_4007 = Field.create("ALIGNMENTFILL_AT_4007", 4007, FieldType.INT8).setScale(1.0); public static final Field TRIGGERGAPOVERRIDEFROM1 = Field.create("TRIGGERGAPOVERRIDEFROM1", 4008, FieldType.FLOAT); public static final Field TRIGGERGAPOVERRIDEFROM2 = Field.create("TRIGGERGAPOVERRIDEFROM2", 4012, FieldType.FLOAT); @@ -3921,8 +3922,8 @@ public class Fields { MAXACRPM, MAXACTPS, MAXACCLT, - KNOCKNOISE, KNOCKNOISERPMBINS, + UNUSED28, MULTISPARKMAXSPARKINGANGLE, MULTISPARKMAXEXTRASPARKCOUNT, SPARKDWELLRPMBINS, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index 538f77dcec..76a0fcd47d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Apr 17 21:36:12 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Apr 18 12:07:23 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -98,7 +98,7 @@ public class TsOutputs { public static final String ENGINE_MAKE_SUBARU = "Subaru"; public static final String ENGINE_MAKE_TOYOTA = "Toyota"; public static final String ENGINE_MAKE_VAG = "VAG"; - public static final int ENGINE_NOISE_CURVE_SIZE = 8; + public static final int ENGINE_NOISE_CURVE_SIZE = 16; public static final int ENGINE_SNIFFER_UNIT_US = 10; public static final int ENUM_16_BITS = 60000; public static final int ENUM_32_BITS = 2000000000; diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 54adbf8c62..f2315aaeb0 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -200,16 +200,6 @@ - - - -
- -
- -