diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 6af8366bb6..e4bd3c9165 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.31 -#define SIGNATURE_HASH 2555715459 -#define TS_SIGNATURE "rusEFI 2020.08.31.all.2555715459" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1733849178 +#define TS_SIGNATURE "rusEFI 2020.09.01.all.1733849178" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index ed84689600..1a7c42110c 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.31 -#define SIGNATURE_HASH 1357453962 -#define TS_SIGNATURE "rusEFI 2020.08.31.frankenso_na6.1357453962" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 2950985043 +#define TS_SIGNATURE "rusEFI 2020.09.01.frankenso_na6.2950985043" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index fc3024668b..df5be00e0f 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.31 -#define SIGNATURE_HASH 3078707747 -#define TS_SIGNATURE "rusEFI 2020.08.31.kin.3078707747" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1217148410 +#define TS_SIGNATURE "rusEFI 2020.09.01.kin.1217148410" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index c4ec1dead2..49fcbb98ac 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.31 -#define SIGNATURE_HASH 1677429464 -#define TS_SIGNATURE "rusEFI 2020.08.31.mre_f4.1677429464" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 2633426177 +#define TS_SIGNATURE "rusEFI 2020.09.01.mre_f4.2633426177" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 3a158e7193..2cf59e3f08 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.31 -#define SIGNATURE_HASH 1677429464 -#define TS_SIGNATURE "rusEFI 2020.08.31.mre_f7.1677429464" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 2633426177 +#define TS_SIGNATURE "rusEFI 2020.09.01.mre_f7.2633426177" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 6c246d63e8..9dd33ef45f 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.31 -#define SIGNATURE_HASH 2409848381 -#define TS_SIGNATURE "rusEFI 2020.08.31.prometheus_405.2409848381" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1890464228 +#define TS_SIGNATURE "rusEFI 2020.09.01.prometheus_405.1890464228" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 04609417d8..fdd600904c 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.31 -#define SIGNATURE_HASH 2409848381 -#define TS_SIGNATURE "rusEFI 2020.08.31.prometheus_469.2409848381" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1890464228 +#define TS_SIGNATURE "rusEFI 2020.09.01.prometheus_469.1890464228" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f67ab605fc..e5363f7525 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.31 -#define SIGNATURE_HASH 2903199942 -#define TS_SIGNATURE "rusEFI 2020.08.31.proteus_f4.2903199942" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1376141087 +#define TS_SIGNATURE "rusEFI 2020.09.01.proteus_f4.1376141087" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8be12cca3b..8c4e2a618c 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.31 -#define SIGNATURE_HASH 2903199942 -#define TS_SIGNATURE "rusEFI 2020.08.31.proteus_f7.2903199942" +#define SIGNATURE_DATE 2020.09.01 +#define SIGNATURE_HASH 1376141087 +#define TS_SIGNATURE "rusEFI 2020.09.01.proteus_f7.1376141087" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index cfd898e6b7..11e62844b2 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 f7b9af4f0f..994895e66d 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.31.all.2555715459" + signature = "rusEFI 2020.09.01.all.1733849178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.all.2555715459" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.all.1733849178" ; 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 Mon Aug 31 21:09:30 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 42cc19e847..71d76fff19 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.31.frankenso_na6.1357453962" + signature = "rusEFI 2020.09.01.frankenso_na6.2950985043" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.frankenso_na6.1357453962" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.frankenso_na6.2950985043" ; 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 Mon Aug 31 21:09:35 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index cc6ab90998..476f233f39 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.31.kin.3078707747" + signature = "rusEFI 2020.09.01.kin.1217148410" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.kin.3078707747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.kin.1217148410" ; 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 Mon Aug 31 21:09:42 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 79a6fd94fe..91ba1d80f6 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.31.mre_f4.1677429464" + signature = "rusEFI 2020.09.01.mre_f4.2633426177" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.mre_f4.1677429464" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.mre_f4.2633426177" ; 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 Mon Aug 31 21:09:33 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 63d444a84a..14f8f20341 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.31.mre_f7.1677429464" + signature = "rusEFI 2020.09.01.mre_f7.2633426177" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.mre_f7.1677429464" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.mre_f7.2633426177" ; 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 Mon Aug 31 21:09:32 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f5ec3f8460..d3239fe9c3 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.31.prometheus_405.2409848381" + signature = "rusEFI 2020.09.01.prometheus_405.1890464228" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.prometheus_405.2409848381" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.prometheus_405.1890464228" ; 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 Mon Aug 31 21:09:38 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 2fb64c3c9a..1900e9554f 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.31.prometheus_469.2409848381" + signature = "rusEFI 2020.09.01.prometheus_469.1890464228" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.prometheus_469.2409848381" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.prometheus_469.1890464228" ; 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 Mon Aug 31 21:09:36 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index fe2260c784..a194c00d60 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.31.proteus_f4.2903199942" + signature = "rusEFI 2020.09.01.proteus_f4.1376141087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.proteus_f4.2903199942" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.proteus_f4.1376141087" ; 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 Mon Aug 31 21:09:41 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al", diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index ead0d6bed8..61c8eae043 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.31.proteus_f7.2903199942" + signature = "rusEFI 2020.09.01.proteus_f7.1376141087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.31.proteus_f7.2903199942" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.01.proteus_f7.1376141087" ; 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 Mon Aug 31 21:09:39 UTC 2020 +; 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 pageSize = 20000 page = 1 @@ -1666,6 +1666,15 @@ page = 1 tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 sd_status = scalar, U08, 246, "", 1.0, 0.0 + knock1 = scalar, S08, 250, "dbv", 1, 0 + knock2 = scalar, S08, 251, "dbv", 1, 0 + knock3 = scalar, S08, 252, "dbv", 1, 0 + knock4 = scalar, S08, 253, "dbv", 1, 0 + knock5 = scalar, S08, 254, "dbv", 1, 0 + knock6 = scalar, S08, 255, "dbv", 1, 0 + knock7 = scalar, S08, 256, "dbv", 1, 0 + knock8 = scalar, S08, 257, "dbv", 1, 0 + ; ; see TunerStudioOutputChannels struct ; @@ -2287,6 +2296,16 @@ gaugeCategory = Sensors - Raw rawOilPressureGauge = rawOilPressure, "Raw Oil Pressure", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawPpsSecondaryGauge = rawPpsSecondary,"Raw Pedal Secondary","volts", 0, 5, 0, 0, 5, 5, 3, 0 +gaugeCategory = Knock + knock1Gauge = knock1, "Knock Cyl 1", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock2Gauge = knock2, "Knock Cyl 2", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock3Gauge = knock3, "Knock Cyl 3", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock4Gauge = knock4, "Knock Cyl 4", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock5Gauge = knock5, "Knock Cyl 5", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock6Gauge = knock6, "Knock Cyl 6", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock7Gauge = knock7, "Knock Cyl 7", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + knock8Gauge = knock8, "Knock Cyl 8", "dBv", -60, 10, -60, -60, 10, 10, 0, 0 + [WueAnalyze] ; wueCurveName, afrTempCompensationCurve, lambdaTargetTableName, lambdaChannel, coolantTempChannel, egoCorrectionChannel, wueChannel, activeCondition @@ -2490,6 +2509,14 @@ gaugeCategory = Sensors - Raw entry = etb1DutyCycle, "ETB Duty", float, "%.3f" entry = etbTarget, "ETB Target", float, "%.3f" + entry = knock1, "Knock 1", int, "%d" + entry = knock2, "Knock 2", int, "%d" + entry = knock3, "Knock 3", int, "%d" + entry = knock4, "Knock 4", int, "%d" + entry = knock5, "Knock 5", int, "%d" + entry = knock6, "Knock 6", int, "%d" + entry = knock7, "Knock 7", int, "%d" + entry = knock8, "Knock 8", int, "%d" ; tpsADC = U16, "ADC", ; alignmet = U16, "al",