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 93aaa671dd..5f1550f069 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 Aug 30 19:40:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 11:22:35 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1783,40 +1783,40 @@ struct engine_configuration_s { bool consumeObdSensors : 1; /** offset 976 bit 16 */ - bool unusedBit_251_16 : 1; + bool knockBankCyl1 : 1; /** offset 976 bit 17 */ - bool unusedBit_251_17 : 1; + bool knockBankCyl2 : 1; /** offset 976 bit 18 */ - bool unusedBit_251_18 : 1; + bool knockBankCyl3 : 1; /** offset 976 bit 19 */ - bool unusedBit_251_19 : 1; + bool knockBankCyl4 : 1; /** offset 976 bit 20 */ - bool unusedBit_251_20 : 1; + bool knockBankCyl5 : 1; /** offset 976 bit 21 */ - bool unusedBit_251_21 : 1; + bool knockBankCyl6 : 1; /** offset 976 bit 22 */ - bool unusedBit_251_22 : 1; + bool knockBankCyl7 : 1; /** offset 976 bit 23 */ - bool unusedBit_251_23 : 1; + bool knockBankCyl8 : 1; /** offset 976 bit 24 */ - bool unusedBit_251_24 : 1; + bool knockBankCyl9 : 1; /** offset 976 bit 25 */ - bool unusedBit_251_25 : 1; + bool knockBankCyl10 : 1; /** offset 976 bit 26 */ - bool unusedBit_251_26 : 1; + bool knockBankCyl11 : 1; /** offset 976 bit 27 */ - bool unusedBit_251_27 : 1; + bool knockBankCyl12 : 1; /** offset 976 bit 28 */ bool unusedBit_251_28 : 1; @@ -3656,4 +3656,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Aug 30 19:40:17 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 11:22:35 UTC 2020 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 62a6386f88..2eacdfe708 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -909,6 +909,18 @@ #define joystickCPin_offset 941 #define joystickDPin_offset 942 #define knockBandCustom_offset 328 +#define knockBankCyl10_offset 976 +#define knockBankCyl11_offset 976 +#define knockBankCyl12_offset 976 +#define knockBankCyl1_offset 976 +#define knockBankCyl2_offset 976 +#define knockBankCyl3_offset 976 +#define knockBankCyl4_offset 976 +#define knockBankCyl5_offset 976 +#define knockBankCyl6_offset 976 +#define knockBankCyl7_offset 976 +#define knockBankCyl8_offset 976 +#define knockBankCyl9_offset 976 #define knockDetectionWindowEnd_offset 1504 #define knockDetectionWindowStart_offset 1500 #define knockNoise_offset 1820 @@ -1135,8 +1147,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.30 -#define SIGNATURE_HASH 2002906841 +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 555686289 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1443,7 +1455,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.30.kin.2002906841" +#define TS_SIGNATURE "rusEFI 2020.09.02.kin.555686289" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1488,18 +1500,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_16_offset 976 -#define unusedBit_251_17_offset 976 -#define unusedBit_251_18_offset 976 -#define unusedBit_251_19_offset 976 -#define unusedBit_251_20_offset 976 -#define unusedBit_251_21_offset 976 -#define unusedBit_251_22_offset 976 -#define unusedBit_251_23_offset 976 -#define unusedBit_251_24_offset 976 -#define unusedBit_251_25_offset 976 -#define unusedBit_251_26_offset 976 -#define unusedBit_251_27_offset 976 #define unusedBit_251_28_offset 976 #define unusedBit_251_29_offset 976 #define unusedBit_284_30_offset 976 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index e8b064e5f4..5ce91059a0 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 Aug 30 19:39:58 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1783,40 +1783,40 @@ struct engine_configuration_s { bool consumeObdSensors : 1; /** offset 976 bit 16 */ - bool unusedBit_251_16 : 1; + bool knockBankCyl1 : 1; /** offset 976 bit 17 */ - bool unusedBit_251_17 : 1; + bool knockBankCyl2 : 1; /** offset 976 bit 18 */ - bool unusedBit_251_18 : 1; + bool knockBankCyl3 : 1; /** offset 976 bit 19 */ - bool unusedBit_251_19 : 1; + bool knockBankCyl4 : 1; /** offset 976 bit 20 */ - bool unusedBit_251_20 : 1; + bool knockBankCyl5 : 1; /** offset 976 bit 21 */ - bool unusedBit_251_21 : 1; + bool knockBankCyl6 : 1; /** offset 976 bit 22 */ - bool unusedBit_251_22 : 1; + bool knockBankCyl7 : 1; /** offset 976 bit 23 */ - bool unusedBit_251_23 : 1; + bool knockBankCyl8 : 1; /** offset 976 bit 24 */ - bool unusedBit_251_24 : 1; + bool knockBankCyl9 : 1; /** offset 976 bit 25 */ - bool unusedBit_251_25 : 1; + bool knockBankCyl10 : 1; /** offset 976 bit 26 */ - bool unusedBit_251_26 : 1; + bool knockBankCyl11 : 1; /** offset 976 bit 27 */ - bool unusedBit_251_27 : 1; + bool knockBankCyl12 : 1; /** offset 976 bit 28 */ bool unusedBit_251_28 : 1; @@ -3656,4 +3656,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index aadbddc901..9f8f616e04 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 6fbba0d974..5d99c786f8 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index be8d096a6f..e91649ad10 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index cb6aaa0529..f2308821e4 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 4cd7941c82..6e935aad35 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -909,6 +909,18 @@ #define joystickCPin_offset 941 #define joystickDPin_offset 942 #define knockBandCustom_offset 328 +#define knockBankCyl10_offset 976 +#define knockBankCyl11_offset 976 +#define knockBankCyl12_offset 976 +#define knockBankCyl1_offset 976 +#define knockBankCyl2_offset 976 +#define knockBankCyl3_offset 976 +#define knockBankCyl4_offset 976 +#define knockBankCyl5_offset 976 +#define knockBankCyl6_offset 976 +#define knockBankCyl7_offset 976 +#define knockBankCyl8_offset 976 +#define knockBankCyl9_offset 976 #define knockDetectionWindowEnd_offset 1504 #define knockDetectionWindowStart_offset 1500 #define knockNoise_offset 1820 @@ -1135,8 +1147,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.30 -#define SIGNATURE_HASH 1488300921 +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 248208433 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1443,7 +1455,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.30.all.1488300921" +#define TS_SIGNATURE "rusEFI 2020.09.02.all.248208433" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1488,18 +1500,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_16_offset 976 -#define unusedBit_251_17_offset 976 -#define unusedBit_251_18_offset 976 -#define unusedBit_251_19_offset 976 -#define unusedBit_251_20_offset 976 -#define unusedBit_251_21_offset 976 -#define unusedBit_251_22_offset 976 -#define unusedBit_251_23_offset 976 -#define unusedBit_251_24_offset 976 -#define unusedBit_251_25_offset 976 -#define unusedBit_251_26_offset 976 -#define unusedBit_251_27_offset 976 #define unusedBit_251_28_offset 976 #define unusedBit_251_29_offset 976 #define unusedBit_284_30_offset 976 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e4bd3c9165..9e556a67cc 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1733849178 -#define TS_SIGNATURE "rusEFI 2020.09.01.all.1733849178" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 248208433 +#define TS_SIGNATURE "rusEFI 2020.09.02.all.248208433" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1a7c42110c..b38d57ba46 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 2950985043 -#define TS_SIGNATURE "rusEFI 2020.09.01.frankenso_na6.2950985043" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 3329710392 +#define TS_SIGNATURE "rusEFI 2020.09.02.frankenso_na6.3329710392" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index df5be00e0f..0fe9152852 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1217148410 -#define TS_SIGNATURE "rusEFI 2020.09.01.kin.1217148410" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 555686289 +#define TS_SIGNATURE "rusEFI 2020.09.02.kin.555686289" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 49fcbb98ac..f377893dbf 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 2633426177 -#define TS_SIGNATURE "rusEFI 2020.09.01.mre_f4.2633426177" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 4117088618 +#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f4.4117088618" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 2cf59e3f08..d84244f454 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 2633426177 -#define TS_SIGNATURE "rusEFI 2020.09.01.mre_f7.2633426177" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 4117088618 +#define TS_SIGNATURE "rusEFI 2020.09.02.mre_f7.4117088618" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 9dd33ef45f..297afd3e7c 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1890464228 -#define TS_SIGNATURE "rusEFI 2020.09.01.prometheus_405.1890464228" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 423435663 +#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_405.423435663" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index fdd600904c..ec05e2e9b4 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1890464228 -#define TS_SIGNATURE "rusEFI 2020.09.01.prometheus_469.1890464228" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 423435663 +#define TS_SIGNATURE "rusEFI 2020.09.02.prometheus_469.423435663" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index e5363f7525..10cf875f2d 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1376141087 -#define TS_SIGNATURE "rusEFI 2020.09.01.proteus_f4.1376141087" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 999625588 +#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f4.999625588" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8c4e2a618c..9b661fa70c 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.09.01 -#define SIGNATURE_HASH 1376141087 -#define TS_SIGNATURE "rusEFI 2020.09.01.proteus_f7.1376141087" +#define SIGNATURE_DATE 2020.09.02 +#define SIGNATURE_HASH 999625588 +#define TS_SIGNATURE "rusEFI 2020.09.02.proteus_f7.999625588" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 11e62844b2..247cc7cc53 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 994895e66d..f8150006e9 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.all.1733849178" + signature = "rusEFI 2020.09.02.all.248208433" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.all.1733849178" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.all.248208433" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:06:49 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3688,7 +3688,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 71d76fff19..82e6680e0a 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.frankenso_na6.2950985043" + signature = "rusEFI 2020.09.02.frankenso_na6.3329710392" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.frankenso_na6.2950985043" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.frankenso_na6.3329710392" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:02 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:28 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3688,7 +3688,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 476f233f39..b8daa6be63 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.kin.1217148410" + signature = "rusEFI 2020.09.02.kin.555686289" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.kin.1217148410" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.kin.555686289" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Tue Sep 01 01:07:10 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 02 11:22:35 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3689,7 +3689,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 91ba1d80f6..2eca7e4a58 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.mre_f4.2633426177" + signature = "rusEFI 2020.09.02.mre_f4.4117088618" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.mre_f4.2633426177" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.mre_f4.4117088618" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:27 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3670,7 +3670,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 14f8f20341..679d542931 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.mre_f7.2633426177" + signature = "rusEFI 2020.09.02.mre_f7.4117088618" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.mre_f7.2633426177" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.mre_f7.4117088618" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:06:51 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:25 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3670,7 +3670,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 d3239fe9c3..502eb25358 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.prometheus_405.1890464228" + signature = "rusEFI 2020.09.02.prometheus_405.423435663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.prometheus_405.1890464228" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.prometheus_405.423435663" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:05 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:31 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3684,7 +3684,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 1900e9554f..aa75adcdde 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.prometheus_469.1890464228" + signature = "rusEFI 2020.09.02.prometheus_469.423435663" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.prometheus_469.1890464228" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.prometheus_469.423435663" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:29 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3684,7 +3684,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 a194c00d60..5a3b4d4413 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.proteus_f4.1376141087" + signature = "rusEFI 2020.09.02.proteus_f4.999625588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.proteus_f4.1376141087" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.proteus_f4.999625588" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:09 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:34 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3663,7 +3663,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 61c8eae043..3dc815d1fe 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.01.proteus_f7.1376141087" + signature = "rusEFI 2020.09.02.proteus_f7.999625588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.01.proteus_f7.1376141087" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.02.proteus_f7.999625588" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 01 01:07:07 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:32 UTC 2020 pageSize = 20000 page = 1 @@ -544,18 +544,18 @@ page = 1 verboseVVTDecoding = bits, U32, 976, [13:13], "false", "true" invertCamVVTSignal = bits, U32, 976, [14:14], "false", "true" consumeObdSensors = bits, U32, 976, [15:15], "false", "true" - unusedBit_251_16 = bits, U32, 976, [16:16], "false", "true" - unusedBit_251_17 = bits, U32, 976, [17:17], "false", "true" - unusedBit_251_18 = bits, U32, 976, [18:18], "false", "true" - unusedBit_251_19 = bits, U32, 976, [19:19], "false", "true" - unusedBit_251_20 = bits, U32, 976, [20:20], "false", "true" - unusedBit_251_21 = bits, U32, 976, [21:21], "false", "true" - unusedBit_251_22 = bits, U32, 976, [22:22], "false", "true" - unusedBit_251_23 = bits, U32, 976, [23:23], "false", "true" - unusedBit_251_24 = bits, U32, 976, [24:24], "false", "true" - unusedBit_251_25 = bits, U32, 976, [25:25], "false", "true" - unusedBit_251_26 = bits, U32, 976, [26:26], "false", "true" - unusedBit_251_27 = bits, U32, 976, [27:27], "false", "true" + knockBankCyl1 = bits, U32, 976, [16:16], "Channel 1", "Channel 2" + knockBankCyl2 = bits, U32, 976, [17:17], "Channel 1", "Channel 2" + knockBankCyl3 = bits, U32, 976, [18:18], "Channel 1", "Channel 2" + knockBankCyl4 = bits, U32, 976, [19:19], "Channel 1", "Channel 2" + knockBankCyl5 = bits, U32, 976, [20:20], "Channel 1", "Channel 2" + knockBankCyl6 = bits, U32, 976, [21:21], "Channel 1", "Channel 2" + knockBankCyl7 = bits, U32, 976, [22:22], "Channel 1", "Channel 2" + knockBankCyl8 = bits, U32, 976, [23:23], "Channel 1", "Channel 2" + knockBankCyl9 = bits, U32, 976, [24:24], "Channel 1", "Channel 2" + knockBankCyl10 = bits, U32, 976, [25:25], "Channel 1", "Channel 2" + knockBankCyl11 = bits, U32, 976, [26:26], "Channel 1", "Channel 2" + knockBankCyl12 = bits, U32, 976, [27:27], "Channel 1", "Channel 2" unusedBit_251_28 = bits, U32, 976, [28:28], "false", "true" unusedBit_251_29 = bits, U32, 976, [29:29], "false", "true" unusedBit_284_30 = bits, U32, 976, [30:30], "false", "true" @@ -3663,7 +3663,22 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = softwareKnock, "Software Knock" field = "Enable", enableSoftwareKnock - field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + field = "Knock filter frequency", knockBandCustom, {enableSoftwareKnock} + field = "" + field = "Select the nearest sensor for each cylinder" + field = "Cylinder 1", knockBankCyl1, {enableSoftwareKnock} + field = "Cylinder 2", knockBankCyl2, {enableSoftwareKnock && cylindersCount >= 2} + field = "Cylinder 3", knockBankCyl3, {enableSoftwareKnock && cylindersCount >= 3} + field = "Cylinder 4", knockBankCyl4, {enableSoftwareKnock && cylindersCount >= 4} + field = "Cylinder 5", knockBankCyl5, {enableSoftwareKnock && cylindersCount >= 5} + field = "Cylinder 6", knockBankCyl6, {enableSoftwareKnock && cylindersCount >= 6} + field = "Cylinder 7", knockBankCyl7, {enableSoftwareKnock && cylindersCount >= 7} + field = "Cylinder 8", knockBankCyl8, {enableSoftwareKnock && cylindersCount >= 8} + field = "Cylinder 9", knockBankCyl9, {enableSoftwareKnock && cylindersCount >= 9} + field = "Cylinder 10", knockBankCyl10, {enableSoftwareKnock && cylindersCount >= 10} + field = "Cylinder 11", knockBankCyl11, {enableSoftwareKnock && cylindersCount >= 11} + field = "Cylinder 12", knockBankCyl12, {enableSoftwareKnock && cylindersCount >= 12} + ; 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 2edf66c11b..81322e75dc 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Aug 30 19:39:58 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 02 11:22:23 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -888,6 +888,18 @@ public class Fields { public static final int joystickCPin_offset = 941; public static final int joystickDPin_offset = 942; public static final int knockBandCustom_offset = 328; + public static final int knockBankCyl10_offset = 976; + public static final int knockBankCyl11_offset = 976; + public static final int knockBankCyl12_offset = 976; + public static final int knockBankCyl1_offset = 976; + public static final int knockBankCyl2_offset = 976; + public static final int knockBankCyl3_offset = 976; + public static final int knockBankCyl4_offset = 976; + public static final int knockBankCyl5_offset = 976; + public static final int knockBankCyl6_offset = 976; + public static final int knockBankCyl7_offset = 976; + public static final int knockBankCyl8_offset = 976; + public static final int knockBankCyl9_offset = 976; public static final int knockDetectionWindowEnd_offset = 1504; public static final int knockDetectionWindowStart_offset = 1500; public static final int knockNoise_offset = 1820; @@ -1093,7 +1105,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1488300921; + public static final int SIGNATURE_HASH = 248208433; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1350,7 +1362,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.08.30.all.1488300921"; + public static final String TS_SIGNATURE = "rusEFI 2020.09.02.all.248208433"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1392,18 +1404,6 @@ public class Fields { public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; public static final int unusedBit4_1476_offset = 1476; - public static final int unusedBit_251_16_offset = 976; - public static final int unusedBit_251_17_offset = 976; - public static final int unusedBit_251_18_offset = 976; - public static final int unusedBit_251_19_offset = 976; - public static final int unusedBit_251_20_offset = 976; - public static final int unusedBit_251_21_offset = 976; - public static final int unusedBit_251_22_offset = 976; - public static final int unusedBit_251_23_offset = 976; - public static final int unusedBit_251_24_offset = 976; - public static final int unusedBit_251_25_offset = 976; - public static final int unusedBit_251_26_offset = 976; - public static final int unusedBit_251_27_offset = 976; public static final int unusedBit_251_28_offset = 976; public static final int unusedBit_251_29_offset = 976; public static final int unusedBit_284_30_offset = 976; @@ -1968,18 +1968,18 @@ public class Fields { public static final Field VERBOSEVVTDECODING = Field.create("VERBOSEVVTDECODING", 976, FieldType.BIT, 13); public static final Field INVERTCAMVVTSIGNAL = Field.create("INVERTCAMVVTSIGNAL", 976, FieldType.BIT, 14); public static final Field CONSUMEOBDSENSORS = Field.create("CONSUMEOBDSENSORS", 976, FieldType.BIT, 15); - public static final Field UNUSEDBIT_251_16 = Field.create("UNUSEDBIT_251_16", 976, FieldType.BIT, 16); - public static final Field UNUSEDBIT_251_17 = Field.create("UNUSEDBIT_251_17", 976, FieldType.BIT, 17); - public static final Field UNUSEDBIT_251_18 = Field.create("UNUSEDBIT_251_18", 976, FieldType.BIT, 18); - public static final Field UNUSEDBIT_251_19 = Field.create("UNUSEDBIT_251_19", 976, FieldType.BIT, 19); - public static final Field UNUSEDBIT_251_20 = Field.create("UNUSEDBIT_251_20", 976, FieldType.BIT, 20); - public static final Field UNUSEDBIT_251_21 = Field.create("UNUSEDBIT_251_21", 976, FieldType.BIT, 21); - public static final Field UNUSEDBIT_251_22 = Field.create("UNUSEDBIT_251_22", 976, FieldType.BIT, 22); - public static final Field UNUSEDBIT_251_23 = Field.create("UNUSEDBIT_251_23", 976, FieldType.BIT, 23); - public static final Field UNUSEDBIT_251_24 = Field.create("UNUSEDBIT_251_24", 976, FieldType.BIT, 24); - public static final Field UNUSEDBIT_251_25 = Field.create("UNUSEDBIT_251_25", 976, FieldType.BIT, 25); - public static final Field UNUSEDBIT_251_26 = Field.create("UNUSEDBIT_251_26", 976, FieldType.BIT, 26); - public static final Field UNUSEDBIT_251_27 = Field.create("UNUSEDBIT_251_27", 976, FieldType.BIT, 27); + public static final Field KNOCKBANKCYL1 = Field.create("KNOCKBANKCYL1", 976, FieldType.BIT, 16); + public static final Field KNOCKBANKCYL2 = Field.create("KNOCKBANKCYL2", 976, FieldType.BIT, 17); + public static final Field KNOCKBANKCYL3 = Field.create("KNOCKBANKCYL3", 976, FieldType.BIT, 18); + public static final Field KNOCKBANKCYL4 = Field.create("KNOCKBANKCYL4", 976, FieldType.BIT, 19); + public static final Field KNOCKBANKCYL5 = Field.create("KNOCKBANKCYL5", 976, FieldType.BIT, 20); + public static final Field KNOCKBANKCYL6 = Field.create("KNOCKBANKCYL6", 976, FieldType.BIT, 21); + public static final Field KNOCKBANKCYL7 = Field.create("KNOCKBANKCYL7", 976, FieldType.BIT, 22); + public static final Field KNOCKBANKCYL8 = Field.create("KNOCKBANKCYL8", 976, FieldType.BIT, 23); + public static final Field KNOCKBANKCYL9 = Field.create("KNOCKBANKCYL9", 976, FieldType.BIT, 24); + public static final Field KNOCKBANKCYL10 = Field.create("KNOCKBANKCYL10", 976, FieldType.BIT, 25); + public static final Field KNOCKBANKCYL11 = Field.create("KNOCKBANKCYL11", 976, FieldType.BIT, 26); + public static final Field KNOCKBANKCYL12 = Field.create("KNOCKBANKCYL12", 976, FieldType.BIT, 27); public static final Field UNUSEDBIT_251_28 = Field.create("UNUSEDBIT_251_28", 976, FieldType.BIT, 28); public static final Field UNUSEDBIT_251_29 = Field.create("UNUSEDBIT_251_29", 976, FieldType.BIT, 29); public static final Field UNUSEDBIT_284_30 = Field.create("UNUSEDBIT_284_30", 976, FieldType.BIT, 30); @@ -2992,18 +2992,18 @@ public class Fields { VERBOSEVVTDECODING, INVERTCAMVVTSIGNAL, CONSUMEOBDSENSORS, - UNUSEDBIT_251_16, - UNUSEDBIT_251_17, - UNUSEDBIT_251_18, - UNUSEDBIT_251_19, - UNUSEDBIT_251_20, - UNUSEDBIT_251_21, - UNUSEDBIT_251_22, - UNUSEDBIT_251_23, - UNUSEDBIT_251_24, - UNUSEDBIT_251_25, - UNUSEDBIT_251_26, - UNUSEDBIT_251_27, + KNOCKBANKCYL1, + KNOCKBANKCYL2, + KNOCKBANKCYL3, + KNOCKBANKCYL4, + KNOCKBANKCYL5, + KNOCKBANKCYL6, + KNOCKBANKCYL7, + KNOCKBANKCYL8, + KNOCKBANKCYL9, + KNOCKBANKCYL10, + KNOCKBANKCYL11, + KNOCKBANKCYL12, UNUSEDBIT_251_28, UNUSEDBIT_251_29, UNUSEDBIT_284_30, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 801d22e5d7..46b8821c41 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +