diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a45cc1f936..cb4931bb18 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.20 -#define SIGNATURE_HASH 785806302 -#define TS_SIGNATURE "rusEFI 2020.08.20.all.785806302" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 2457837773 +#define TS_SIGNATURE "rusEFI 2020.08.21.all.2457837773" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 35ae7b3bf5..4948caa55d 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.20 -#define SIGNATURE_HASH 3865736919 -#define TS_SIGNATURE "rusEFI 2020.08.20.frankenso_na6.3865736919" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 1522771396 +#define TS_SIGNATURE "rusEFI 2020.08.21.frankenso_na6.1522771396" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 2606242aa1..8e56ce484d 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.20 -#define SIGNATURE_HASH 16922238 -#define TS_SIGNATURE "rusEFI 2020.08.20.kin.16922238" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 3182159213 +#define TS_SIGNATURE "rusEFI 2020.08.21.kin.3182159213" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 2d4fdab761..052669d9fd 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.20 -#define SIGNATURE_HASH 3581470341 -#define TS_SIGNATURE "rusEFI 2020.08.20.mre_f4.3581470341" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 1775318422 +#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f4.1775318422" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 85fe99e0cf..96aa6932f8 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.20 -#define SIGNATURE_HASH 3581470341 -#define TS_SIGNATURE "rusEFI 2020.08.20.mre_f7.3581470341" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 1775318422 +#define TS_SIGNATURE "rusEFI 2020.08.21.mre_f7.1775318422" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 06ceb28db3..c0a487008d 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.20 -#define SIGNATURE_HASH 958411360 -#define TS_SIGNATURE "rusEFI 2020.08.20.prometheus_405.958411360" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 2240405875 +#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_405.2240405875" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index afa74716ee..f1cceab94f 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.20 -#define SIGNATURE_HASH 958411360 -#define TS_SIGNATURE "rusEFI 2020.08.20.prometheus_469.958411360" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 2240405875 +#define TS_SIGNATURE "rusEFI 2020.08.21.prometheus_469.2240405875" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2d9a20ea10..3b8de4bcef 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.20 -#define SIGNATURE_HASH 3480726917 -#define TS_SIGNATURE "rusEFI 2020.08.20.proteus_f4.3480726917" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 1943961238 +#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f4.1943961238" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 1487da0261..52fd51dd04 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.20 -#define SIGNATURE_HASH 3480726917 -#define TS_SIGNATURE "rusEFI 2020.08.20.proteus_f7.3480726917" +#define SIGNATURE_DATE 2020.08.21 +#define SIGNATURE_HASH 1943961238 +#define TS_SIGNATURE "rusEFI 2020.08.21.proteus_f7.1943961238" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 6c1e71db34..8f1f1b6be0 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 ac01b92369..bef0beb4c4 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.20.all.785806302" + signature = "rusEFI 2020.08.21.all.2457837773" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.all.785806302" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.all.2457837773" ; 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 20 11:44:50 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:29 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3087,6 +3089,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 03fb9c94fe..11696cb7b5 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.20.frankenso_na6.3865736919" + signature = "rusEFI 2020.08.21.frankenso_na6.1522771396" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.frankenso_na6.3865736919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.frankenso_na6.1522771396" ; 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 20 11:44:55 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:34 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3087,6 +3089,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 2f714e6a01..3e5dc50ee5 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.20.kin.16922238" + signature = "rusEFI 2020.08.21.kin.3182159213" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.kin.16922238" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.kin.3182159213" ; 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 20 11:45:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Aug 21 12:54:42 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3088,6 +3090,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 0faf5e110d..1da52ba6fc 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.20.mre_f4.3581470341" + signature = "rusEFI 2020.08.21.mre_f4.1775318422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.mre_f4.3581470341" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.mre_f4.1775318422" ; 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 20 11:44:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:33 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3082,6 +3084,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index f3cdb91bf5..aae94428d1 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.20.mre_f7.3581470341" + signature = "rusEFI 2020.08.21.mre_f7.1775318422" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.mre_f7.3581470341" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.mre_f7.1775318422" ; 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 20 11:44:52 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:31 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3082,6 +3084,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a47dd55aec..874fe1b0ec 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.20.prometheus_405.958411360" + signature = "rusEFI 2020.08.21.prometheus_405.2240405875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.prometheus_405.958411360" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.prometheus_405.2240405875" ; 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 20 11:44:58 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:37 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3083,6 +3085,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 9af2f0f36e..88716ab8ee 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.20.prometheus_469.958411360" + signature = "rusEFI 2020.08.21.prometheus_469.2240405875" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.prometheus_469.958411360" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.prometheus_469.2240405875" ; 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 20 11:44:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:36 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3083,6 +3085,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 39027cbb00..9d8cdd70bd 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.20.proteus_f4.3480726917" + signature = "rusEFI 2020.08.21.proteus_f4.1943961238" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.proteus_f4.3480726917" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.proteus_f4.1943961238" ; 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 20 11:45:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:41 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3077,6 +3079,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 3d7e3a256d..327bc89f79 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.20.proteus_f7.3480726917" + signature = "rusEFI 2020.08.21.proteus_f7.1943961238" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.08.20.proteus_f7.3480726917" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.08.21.proteus_f7.1943961238" ; 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 20 11:45:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Aug 21 12:54:39 UTC 2020 pageSize = 20000 page = 1 @@ -1659,6 +1659,7 @@ page = 1 rawClt = scalar, U16, 238, "V",{1/1000}, 0.0 rawIat = scalar, U16, 240, "V",{1/1000}, 0.0 rawOilPressure = scalar, U16, 242, "V",{1/1000}, 0.0 + rawPpsSecondary = scalar, U16, 248, "V",{1/1000}, 0.0 ; we use this to match logs to tunes tuneCrc16 = scalar, U16, 244, "crc16", 1, 0 @@ -2275,6 +2276,7 @@ gaugeCategory = Sensors - Raw rawCltGauge = rawClt , "Raw CLT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 rawIatGauge = rawIat , "Raw IAT", "volts", 0, 5, 0, 0, 5, 5, 3, 0 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 [WueAnalyze] @@ -3077,6 +3079,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" dialog = pedalGauges gauge = pedalPositionGauge gauge = rawPpsPrimaryGauge + gauge = rawPpsSecondaryGauge dialog = pedalSensor, "Accelerator pedal", border panel = pedalSensorLeft, West