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 c81df80984..8fc69783bb 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 Thu Aug 27 04:44:40 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 01:15:28 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1767,7 +1767,7 @@ struct engine_configuration_s { bool dcMotorIdleValve : 1; /** offset 976 bit 12 */ - bool unusedBit_251_12 : 1; + bool enableSoftwareKnock : 1; /** offset 976 bit 13 */ bool unusedBit_251_13 : 1; @@ -3652,4 +3652,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 Thu Aug 27 04:44:40 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 01:15:28 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 99e5067a7c..f4a1a422b4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -328,6 +328,7 @@ #define enableInnovateLC2_offset 976 #define enableLaunchBoost_offset 976 #define enableLaunchRetard_offset 976 +#define enableSoftwareKnock_offset 976 #define enableVerboseCan2Tx_offset 2116 #define enableVerboseCanTx_offset 744 #define engine_configuration_s_size 6000 @@ -1122,8 +1123,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.27 -#define SIGNATURE_HASH 1786209569 +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1581350293 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1426,10 +1427,11 @@ #define ts_show_main_relay true #define ts_show_main_relay_microRusEFI_message false #define ts_show_sd_card true +#define ts_show_software_knock false #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.27.kin.1786209569" +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.1581350293" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1474,7 +1476,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_12_offset 976 #define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 833fbefb7f..75a76628f4 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 Thu Aug 27 04:44:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1767,7 +1767,7 @@ struct engine_configuration_s { bool dcMotorIdleValve : 1; /** offset 976 bit 12 */ - bool unusedBit_251_12 : 1; + bool enableSoftwareKnock : 1; /** offset 976 bit 13 */ bool unusedBit_251_13 : 1; @@ -3652,4 +3652,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 Thu Aug 27 04:44:21 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index ed9b7806f3..16166f4fe0 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 Thu Aug 27 04:44:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 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 71b8c12cb1..7d4884afda 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 Thu Aug 27 04:44:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 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 e07164c3de..ce277e4dcd 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 Thu Aug 27 04:44:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 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 8ab8e807c7..baa2b80482 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 Thu Aug 27 04:44:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 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 54331a1312..56c6f04c5e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -328,6 +328,7 @@ #define enableInnovateLC2_offset 976 #define enableLaunchBoost_offset 976 #define enableLaunchRetard_offset 976 +#define enableSoftwareKnock_offset 976 #define enableVerboseCan2Tx_offset 2116 #define enableVerboseCanTx_offset 744 #define engine_configuration_s_size 6000 @@ -1122,8 +1123,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.27 -#define SIGNATURE_HASH 1168318593 +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1905604661 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1426,10 +1427,11 @@ #define ts_show_main_relay true #define ts_show_main_relay_microRusEFI_message false #define ts_show_sd_card true +#define ts_show_software_knock false #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.27.all.1168318593" +#define TS_SIGNATURE "rusEFI 2020.08.29.all.1905604661" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1474,7 +1476,6 @@ #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 -#define unusedBit_251_12_offset 976 #define unusedBit_251_13_offset 976 #define unusedBit_251_14_offset 976 #define unusedBit_251_15_offset 976 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index e1d44182f0..18b01c1297 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.08.27 -#define SIGNATURE_HASH 1168318593 -#define TS_SIGNATURE "rusEFI 2020.08.27.all.1168318593" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1905604661 +#define TS_SIGNATURE "rusEFI 2020.08.29.all.1905604661" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index aadfb6adc0..39d00e7e16 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.08.27 -#define SIGNATURE_HASH 2367628680 -#define TS_SIGNATURE "rusEFI 2020.08.27.frankenso_na6.2367628680" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 3106487612 +#define TS_SIGNATURE "rusEFI 2020.08.29.frankenso_na6.3106487612" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 96dae363a7..5591077ddc 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.08.27 -#define SIGNATURE_HASH 1786209569 -#define TS_SIGNATURE "rusEFI 2020.08.27.kin.1786209569" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1581350293 +#define TS_SIGNATURE "rusEFI 2020.08.29.kin.1581350293" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 87d3166685..9387ee42f0 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.08.27 -#define SIGNATURE_HASH 3188569562 -#define TS_SIGNATURE "rusEFI 2020.08.27.mre_f4.3188569562" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 2319166830 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f4.2319166830" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 262544e5ac..8dcca4c4c3 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.08.27 -#define SIGNATURE_HASH 3188569562 -#define TS_SIGNATURE "rusEFI 2020.08.27.mre_f7.3188569562" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 2319166830 +#define TS_SIGNATURE "rusEFI 2020.08.29.mre_f7.2319166830" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 733a86998a..82c11b7328 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.08.27 -#define SIGNATURE_HASH 1381327167 -#define TS_SIGNATURE "rusEFI 2020.08.27.prometheus_405.1381327167" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1717795211 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_405.1717795211" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index ed7ec3129e..027dc432e6 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.08.27 -#define SIGNATURE_HASH 1381327167 -#define TS_SIGNATURE "rusEFI 2020.08.27.prometheus_469.1381327167" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1717795211 +#define TS_SIGNATURE "rusEFI 2020.08.29.prometheus_469.1717795211" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index a54817042c..ac92d5d996 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.08.27 -#define SIGNATURE_HASH 2751659738 -#define TS_SIGNATURE "rusEFI 2020.08.27.proteus_f4.2751659738" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1154185072 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f4.1154185072" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 2963d4ef7b..f433b345be 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.08.27 -#define SIGNATURE_HASH 2751659738 -#define TS_SIGNATURE "rusEFI 2020.08.27.proteus_f7.2751659738" +#define SIGNATURE_DATE 2020.08.29 +#define SIGNATURE_HASH 1154185072 +#define TS_SIGNATURE "rusEFI 2020.08.29.proteus_f7.1154185072" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 8686d98485..060468c2db 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 1078d8160b..7f7690227b 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.08.27.all.1168318593" + signature = "rusEFI 2020.08.29.all.1905604661" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.all.1168318593" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.all.1905604661" ; 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 Thu Aug 27 04:44:21 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3654,6 +3654,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 381147abc2..b579d63a77 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.08.27.frankenso_na6.2367628680" + signature = "rusEFI 2020.08.29.frankenso_na6.3106487612" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.frankenso_na6.2367628680" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.frankenso_na6.3106487612" ; 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 Thu Aug 27 04:44:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:20 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3654,6 +3654,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 8bef434cdb..ee5325ca77 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.08.27.kin.1786209569" + signature = "rusEFI 2020.08.29.kin.1581350293" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.kin.1786209569" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.kin.1581350293" ; 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 Thu Aug 27 04:44:40 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Aug 29 01:15:28 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3655,6 +3655,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 8e723a98ae..0ec88823fd 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.08.27.mre_f4.3188569562" + signature = "rusEFI 2020.08.29.mre_f4.2319166830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.mre_f4.3188569562" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f4.2319166830" ; 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 Thu Aug 27 04:44:24 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:19 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3636,6 +3636,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 6044799fec..3990b98e89 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.08.27.mre_f7.3188569562" + signature = "rusEFI 2020.08.29.mre_f7.2319166830" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.mre_f7.3188569562" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.mre_f7.2319166830" ; 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 Thu Aug 27 04:44:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:16 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3636,6 +3636,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 2e8946509d..6900d1ad82 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.08.27.prometheus_405.1381327167" + signature = "rusEFI 2020.08.29.prometheus_405.1717795211" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.prometheus_405.1381327167" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_405.1717795211" ; 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 Thu Aug 27 04:44:28 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:23 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3650,6 +3650,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 84f3077edf..e0b3daebdf 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.08.27.prometheus_469.1381327167" + signature = "rusEFI 2020.08.29.prometheus_469.1717795211" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.prometheus_469.1381327167" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.prometheus_469.1717795211" ; 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 Thu Aug 27 04:44:27 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:22 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -3650,6 +3650,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index a76ca8326b..2a131e76c2 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.08.27.proteus_f4.2751659738" + signature = "rusEFI 2020.08.29.proteus_f4.1154185072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.proteus_f4.2751659738" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f4.1154185072" ; 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 Thu Aug 27 04:44:39 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:26 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -2683,6 +2683,7 @@ menuDialog = main subMenu = mc33Dialog, "GDI Dreams" subMenu = std_separator + subMenu = softwareKnock, "Software Knock" subMenu = std_separator subMenu = etbDialog, "Electronic throttle body (beta version)" @@ -3628,6 +3629,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 440b526e31..e21b6dd6fa 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.08.27.proteus_f7.2751659738" + signature = "rusEFI 2020.08.29.proteus_f7.1154185072" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.27.proteus_f7.2751659738" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.29.proteus_f7.1154185072" ; 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 Thu Aug 27 04:44:30 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:25 UTC 2020 pageSize = 20000 page = 1 @@ -540,7 +540,7 @@ page = 1 showHumanReadableWarning= bits, U32, 976, [9:9], "false", "true" stftIgnoreErrorMagnitude= bits, U32, 976, [10:10], "false", "true" dcMotorIdleValve = bits, U32, 976, [11:11], "false", "true" - unusedBit_251_12 = bits, U32, 976, [12:12], "false", "true" + enableSoftwareKnock = bits, U32, 976, [12:12], "false", "true" unusedBit_251_13 = bits, U32, 976, [13:13], "false", "true" unusedBit_251_14 = bits, U32, 976, [14:14], "false", "true" unusedBit_251_15 = bits, U32, 976, [15:15], "false", "true" @@ -2683,6 +2683,7 @@ menuDialog = main subMenu = mc33Dialog, "GDI Dreams" subMenu = std_separator + subMenu = softwareKnock, "Software Knock" subMenu = std_separator subMenu = etbDialog, "Electronic throttle body (beta version)" @@ -3628,6 +3629,10 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Pin mode", malfunctionIndicatorPinMode field = "Warning Period", warningPeriod + dialog = softwareKnock, "Software Knock" + field = "Enable", enableSoftwareKnock + field = "Band Freq override", knockBandCustom, {enableSoftwareKnock} + ; Engine->hip9011 Settings dialog = hipFunction, "HIP9011 Settings (knock decoder)" field = "Enabled", isHip9011Enabled 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 8c9afb4a0a..577afefb05 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 Thu Aug 27 04:44:21 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Aug 29 01:15:10 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -315,6 +315,7 @@ public class Fields { public static final int enableInnovateLC2_offset = 976; public static final int enableLaunchBoost_offset = 976; public static final int enableLaunchRetard_offset = 976; + public static final int enableSoftwareKnock_offset = 976; public static final int enableVerboseCan2Tx_offset = 2116; public static final int enableVerboseCanTx_offset = 744; public static final int engine_configuration_s_size = 6000; @@ -1081,7 +1082,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 = 1168318593; + public static final int SIGNATURE_HASH = 1905604661; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1338,7 +1339,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.27.all.1168318593"; + public static final String TS_SIGNATURE = "rusEFI 2020.08.29.all.1905604661"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1380,7 +1381,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_12_offset = 976; public static final int unusedBit_251_13_offset = 976; public static final int unusedBit_251_14_offset = 976; public static final int unusedBit_251_15_offset = 976; @@ -1954,7 +1954,7 @@ public class Fields { public static final Field SHOWHUMANREADABLEWARNING = Field.create("SHOWHUMANREADABLEWARNING", 976, FieldType.BIT, 9); public static final Field STFTIGNOREERRORMAGNITUDE = Field.create("STFTIGNOREERRORMAGNITUDE", 976, FieldType.BIT, 10); public static final Field DCMOTORIDLEVALVE = Field.create("DCMOTORIDLEVALVE", 976, FieldType.BIT, 11); - public static final Field UNUSEDBIT_251_12 = Field.create("UNUSEDBIT_251_12", 976, FieldType.BIT, 12); + public static final Field ENABLESOFTWAREKNOCK = Field.create("ENABLESOFTWAREKNOCK", 976, FieldType.BIT, 12); public static final Field UNUSEDBIT_251_13 = Field.create("UNUSEDBIT_251_13", 976, FieldType.BIT, 13); public static final Field UNUSEDBIT_251_14 = Field.create("UNUSEDBIT_251_14", 976, FieldType.BIT, 14); public static final Field UNUSEDBIT_251_15 = Field.create("UNUSEDBIT_251_15", 976, FieldType.BIT, 15); @@ -2978,7 +2978,7 @@ public class Fields { SHOWHUMANREADABLEWARNING, STFTIGNOREERRORMAGNITUDE, DCMOTORIDLEVALVE, - UNUSEDBIT_251_12, + ENABLESOFTWAREKNOCK, UNUSEDBIT_251_13, UNUSEDBIT_251_14, UNUSEDBIT_251_15, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index dc3c060abb..36c0669393 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +