From 9f5603267090ef68baf9bf5dd9cfd3689a71bf9d Mon Sep 17 00:00:00 2001 From: GitHub set-date Action Date: Mon, 22 Jul 2024 00:10:07 +0000 Subject: [PATCH 1/6] Update date --- firmware/controllers/date_stamp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/controllers/date_stamp.h b/firmware/controllers/date_stamp.h index 7c68d14680..2e6d2b2ca9 100644 --- a/firmware/controllers/date_stamp.h +++ b/firmware/controllers/date_stamp.h @@ -1,2 +1,2 @@ #pragma once -#define VCS_DATE 20240717 +#define VCS_DATE 20240722 From d19db63d0e730c9ab2221b841b735e1068c67886 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 21 Jul 2024 22:22:14 -0700 Subject: [PATCH 2/6] dead error code --- firmware/controllers/algo/obd_error_codes.h | 2 +- firmware/controllers/engine_cycle/map_averaging.cpp | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/firmware/controllers/algo/obd_error_codes.h b/firmware/controllers/algo/obd_error_codes.h index 92b07320c1..d064c5d816 100644 --- a/firmware/controllers/algo/obd_error_codes.h +++ b/firmware/controllers/algo/obd_error_codes.h @@ -2109,7 +2109,7 @@ enum class ObdCode : uint16_t { CUSTOM_ERR_6728 = 6728, CUSTOM_ARTIFICIAL_MISFIRE = 6729, - CUSTOM_INSTANT_MAP_DECODING = 6899, + CUSTOM_ERR_6899 = 6899, STACK_USAGE_COMMUNICATION = 6900, STACK_USAGE_MIL = 6901, // not used CUSTOM_6902 = 6902, diff --git a/firmware/controllers/engine_cycle/map_averaging.cpp b/firmware/controllers/engine_cycle/map_averaging.cpp index 037cd2429d..58d3c50cb2 100644 --- a/firmware/controllers/engine_cycle/map_averaging.cpp +++ b/firmware/controllers/engine_cycle/map_averaging.cpp @@ -136,11 +136,6 @@ void mapAveragingAdcCallback(float instantVoltage) { SensorResult mapResult = getMapAvg(currentMapAverager).submit(instantVoltage); - if (!mapResult) { - // hopefully this warning is not too much CPU consumption for fast ADC callback - warning(ObdCode::CUSTOM_INSTANT_MAP_DECODING, "Invalid MAP at %f", instantVoltage); - } - float instantMap = mapResult.value_or(0); #if EFI_TUNER_STUDIO engine->outputChannels.instantMAPValue = instantMap; From 705da5c53b8c5a266d74bb3f037386c89eb731da Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Mon, 22 Jul 2024 05:23:50 +0000 Subject: [PATCH 3/6] Auto-generated configs and docs --- firmware/tunerstudio/generated/fome_alphax-2chan.ini | 4 ++-- firmware/tunerstudio/generated/fome_alphax-4chan.ini | 4 ++-- firmware/tunerstudio/generated/fome_alphax-8chan.ini | 4 ++-- firmware/tunerstudio/generated/fome_atlas.ini | 4 ++-- firmware/tunerstudio/generated/fome_core48.ini | 4 ++-- firmware/tunerstudio/generated/fome_core8.ini | 4 ++-- firmware/tunerstudio/generated/fome_f407-discovery.ini | 4 ++-- firmware/tunerstudio/generated/fome_f429-discovery.ini | 4 ++-- firmware/tunerstudio/generated/fome_frankenso_na6.ini | 4 ++-- firmware/tunerstudio/generated/fome_harley81.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen-gm-e67.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen-honda-k.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen-nb1.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen121nissan.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen121vag.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen128.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen154hyundai.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen72.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen81.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellen88bmw.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellenNA6.ini | 4 ++-- firmware/tunerstudio/generated/fome_hellenNA8_96.ini | 4 ++-- firmware/tunerstudio/generated/fome_mre_f4.ini | 4 ++-- firmware/tunerstudio/generated/fome_mre_f7.ini | 4 ++-- firmware/tunerstudio/generated/fome_prometheus_405.ini | 4 ++-- firmware/tunerstudio/generated/fome_prometheus_469.ini | 4 ++-- firmware/tunerstudio/generated/fome_proteus_f4.ini | 4 ++-- firmware/tunerstudio/generated/fome_proteus_f7.ini | 4 ++-- firmware/tunerstudio/generated/fome_proteus_h7.ini | 4 ++-- firmware/tunerstudio/generated/fome_small-can-board.ini | 4 ++-- firmware/tunerstudio/generated/fome_tdg-pdm8.ini | 4 ++-- .../src/main/java/com/rusefi/config/generated/Fields.java | 2 +- 32 files changed, 63 insertions(+), 63 deletions(-) diff --git a/firmware/tunerstudio/generated/fome_alphax-2chan.ini b/firmware/tunerstudio/generated/fome_alphax-2chan.ini index 36c6cfde20..b4f288a2ec 100644 --- a/firmware/tunerstudio/generated/fome_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.alphax-2chan.1055407544" + signature = "rusEFI (FOME) master.2024.07.22.alphax-2chan.1055407544" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.alphax-2chan.1055407544" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.alphax-2chan.1055407544" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_alphax-4chan.ini b/firmware/tunerstudio/generated/fome_alphax-4chan.ini index 1676230b69..35a00db829 100644 --- a/firmware/tunerstudio/generated/fome_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.alphax-4chan.3022012377" + signature = "rusEFI (FOME) master.2024.07.22.alphax-4chan.3022012377" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.alphax-4chan.3022012377" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.alphax-4chan.3022012377" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_alphax-8chan.ini b/firmware/tunerstudio/generated/fome_alphax-8chan.ini index 22b9977edc..90b5c2ac32 100644 --- a/firmware/tunerstudio/generated/fome_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/fome_alphax-8chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.alphax-8chan.3432724768" + signature = "rusEFI (FOME) master.2024.07.22.alphax-8chan.3432724768" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.alphax-8chan.3432724768" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.alphax-8chan.3432724768" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_atlas.ini b/firmware/tunerstudio/generated/fome_atlas.ini index 8a67dc4ab6..54c96f2879 100644 --- a/firmware/tunerstudio/generated/fome_atlas.ini +++ b/firmware/tunerstudio/generated/fome_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.atlas.1717813964" + signature = "rusEFI (FOME) master.2024.07.22.atlas.1717813964" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.atlas.1717813964" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.atlas.1717813964" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_core48.ini b/firmware/tunerstudio/generated/fome_core48.ini index e6617a3936..19d3ebcdbe 100644 --- a/firmware/tunerstudio/generated/fome_core48.ini +++ b/firmware/tunerstudio/generated/fome_core48.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.core48.82391562" + signature = "rusEFI (FOME) master.2024.07.22.core48.82391562" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.core48.82391562" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.core48.82391562" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_core8.ini b/firmware/tunerstudio/generated/fome_core8.ini index 64dd4412d0..d13e1f8955 100644 --- a/firmware/tunerstudio/generated/fome_core8.ini +++ b/firmware/tunerstudio/generated/fome_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.core8.596654025" + signature = "rusEFI (FOME) master.2024.07.22.core8.596654025" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.core8.596654025" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.core8.596654025" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_f407-discovery.ini b/firmware/tunerstudio/generated/fome_f407-discovery.ini index bbe27481d3..dc3fe869ed 100644 --- a/firmware/tunerstudio/generated/fome_f407-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.f407-discovery.4210670367" + signature = "rusEFI (FOME) master.2024.07.22.f407-discovery.4210670367" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.f407-discovery.4210670367" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.f407-discovery.4210670367" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_f429-discovery.ini b/firmware/tunerstudio/generated/fome_f429-discovery.ini index 344bd7b53d..3f39b8157a 100644 --- a/firmware/tunerstudio/generated/fome_f429-discovery.ini +++ b/firmware/tunerstudio/generated/fome_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.f429-discovery.464992895" + signature = "rusEFI (FOME) master.2024.07.22.f429-discovery.464992895" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.f429-discovery.464992895" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.f429-discovery.464992895" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_frankenso_na6.ini b/firmware/tunerstudio/generated/fome_frankenso_na6.ini index 4893dd98cd..ba82e83c17 100644 --- a/firmware/tunerstudio/generated/fome_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/fome_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.frankenso_na6.971365045" + signature = "rusEFI (FOME) master.2024.07.22.frankenso_na6.971365045" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.frankenso_na6.971365045" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.frankenso_na6.971365045" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_harley81.ini b/firmware/tunerstudio/generated/fome_harley81.ini index ded8d8b2f1..4ce9679ace 100644 --- a/firmware/tunerstudio/generated/fome_harley81.ini +++ b/firmware/tunerstudio/generated/fome_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.harley81.2451702277" + signature = "rusEFI (FOME) master.2024.07.22.harley81.2451702277" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.harley81.2451702277" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.harley81.2451702277" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini index aad85adbcd..2dbac988cb 100644 --- a/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/fome_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen-gm-e67.1927156908" + signature = "rusEFI (FOME) master.2024.07.22.hellen-gm-e67.1927156908" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen-gm-e67.1927156908" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen-gm-e67.1927156908" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini index 8d514f4553..c97245e9fb 100644 --- a/firmware/tunerstudio/generated/fome_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/fome_hellen-honda-k.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen-honda-k.3914324717" + signature = "rusEFI (FOME) master.2024.07.22.hellen-honda-k.3914324717" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen-honda-k.3914324717" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen-honda-k.3914324717" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen-nb1.ini b/firmware/tunerstudio/generated/fome_hellen-nb1.ini index 0ada5c70fb..836917655b 100644 --- a/firmware/tunerstudio/generated/fome_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/fome_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen-nb1.3968871363" + signature = "rusEFI (FOME) master.2024.07.22.hellen-nb1.3968871363" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen-nb1.3968871363" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen-nb1.3968871363" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen121nissan.ini b/firmware/tunerstudio/generated/fome_hellen121nissan.ini index c592490f9e..1976cce2a4 100644 --- a/firmware/tunerstudio/generated/fome_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/fome_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen121nissan.2622195593" + signature = "rusEFI (FOME) master.2024.07.22.hellen121nissan.2622195593" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen121nissan.2622195593" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen121nissan.2622195593" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen121vag.ini b/firmware/tunerstudio/generated/fome_hellen121vag.ini index 238b3e3fcd..fc8fb51126 100644 --- a/firmware/tunerstudio/generated/fome_hellen121vag.ini +++ b/firmware/tunerstudio/generated/fome_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen121vag.810059866" + signature = "rusEFI (FOME) master.2024.07.22.hellen121vag.810059866" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen121vag.810059866" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen121vag.810059866" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen128.ini b/firmware/tunerstudio/generated/fome_hellen128.ini index 3ed02fa887..b70c79ac5d 100644 --- a/firmware/tunerstudio/generated/fome_hellen128.ini +++ b/firmware/tunerstudio/generated/fome_hellen128.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen128.2602916824" + signature = "rusEFI (FOME) master.2024.07.22.hellen128.2602916824" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen128.2602916824" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen128.2602916824" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini index 51a8631c9b..7b7712e622 100644 --- a/firmware/tunerstudio/generated/fome_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/fome_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen154hyundai.265452345" + signature = "rusEFI (FOME) master.2024.07.22.hellen154hyundai.265452345" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen154hyundai.265452345" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen154hyundai.265452345" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen72.ini b/firmware/tunerstudio/generated/fome_hellen72.ini index efbfeb572c..39636ff225 100644 --- a/firmware/tunerstudio/generated/fome_hellen72.ini +++ b/firmware/tunerstudio/generated/fome_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen72.3926107080" + signature = "rusEFI (FOME) master.2024.07.22.hellen72.3926107080" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen72.3926107080" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen72.3926107080" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen81.ini b/firmware/tunerstudio/generated/fome_hellen81.ini index 95cc1a50d6..c312c046b9 100644 --- a/firmware/tunerstudio/generated/fome_hellen81.ini +++ b/firmware/tunerstudio/generated/fome_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen81.1183439178" + signature = "rusEFI (FOME) master.2024.07.22.hellen81.1183439178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen81.1183439178" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen81.1183439178" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellen88bmw.ini b/firmware/tunerstudio/generated/fome_hellen88bmw.ini index ae68fc4abb..a023351a54 100644 --- a/firmware/tunerstudio/generated/fome_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/fome_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellen88bmw.1085394553" + signature = "rusEFI (FOME) master.2024.07.22.hellen88bmw.1085394553" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellen88bmw.1085394553" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellen88bmw.1085394553" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellenNA6.ini b/firmware/tunerstudio/generated/fome_hellenNA6.ini index cc0cce55ba..22db76afff 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA6.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellenNA6.391348312" + signature = "rusEFI (FOME) master.2024.07.22.hellenNA6.391348312" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellenNA6.391348312" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellenNA6.391348312" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini index 5cc1549203..95008faf97 100644 --- a/firmware/tunerstudio/generated/fome_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/fome_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.hellenNA8_96.3030584392" + signature = "rusEFI (FOME) master.2024.07.22.hellenNA8_96.3030584392" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.hellenNA8_96.3030584392" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.hellenNA8_96.3030584392" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_mre_f4.ini b/firmware/tunerstudio/generated/fome_mre_f4.ini index e557541935..6eaf636c66 100644 --- a/firmware/tunerstudio/generated/fome_mre_f4.ini +++ b/firmware/tunerstudio/generated/fome_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.mre_f4.4231618503" + signature = "rusEFI (FOME) master.2024.07.22.mre_f4.4231618503" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.mre_f4.4231618503" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.mre_f4.4231618503" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_mre_f7.ini b/firmware/tunerstudio/generated/fome_mre_f7.ini index 422f5befcc..8ea0ed1ce0 100644 --- a/firmware/tunerstudio/generated/fome_mre_f7.ini +++ b/firmware/tunerstudio/generated/fome_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.mre_f7.4231618503" + signature = "rusEFI (FOME) master.2024.07.22.mre_f7.4231618503" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.mre_f7.4231618503" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.mre_f7.4231618503" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_prometheus_405.ini b/firmware/tunerstudio/generated/fome_prometheus_405.ini index 255b2e589a..9dfcb8d832 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_405.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.prometheus_405.723777519" + signature = "rusEFI (FOME) master.2024.07.22.prometheus_405.723777519" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.prometheus_405.723777519" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.prometheus_405.723777519" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_prometheus_469.ini b/firmware/tunerstudio/generated/fome_prometheus_469.ini index ac8ee7f4ed..b831b4ce75 100644 --- a/firmware/tunerstudio/generated/fome_prometheus_469.ini +++ b/firmware/tunerstudio/generated/fome_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.prometheus_469.723777519" + signature = "rusEFI (FOME) master.2024.07.22.prometheus_469.723777519" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.prometheus_469.723777519" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.prometheus_469.723777519" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_proteus_f4.ini b/firmware/tunerstudio/generated/fome_proteus_f4.ini index cdf34753da..8ec50569fc 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f4.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.proteus_f4.1798819833" + signature = "rusEFI (FOME) master.2024.07.22.proteus_f4.1798819833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.proteus_f4.1798819833" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.proteus_f4.1798819833" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_proteus_f7.ini b/firmware/tunerstudio/generated/fome_proteus_f7.ini index 8d3ed9812e..1f2162b4fe 100644 --- a/firmware/tunerstudio/generated/fome_proteus_f7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.proteus_f7.1798819833" + signature = "rusEFI (FOME) master.2024.07.22.proteus_f7.1798819833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.proteus_f7.1798819833" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.proteus_f7.1798819833" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_proteus_h7.ini b/firmware/tunerstudio/generated/fome_proteus_h7.ini index 3e904856ed..e2a5daa69e 100644 --- a/firmware/tunerstudio/generated/fome_proteus_h7.ini +++ b/firmware/tunerstudio/generated/fome_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.proteus_h7.1798819833" + signature = "rusEFI (FOME) master.2024.07.22.proteus_h7.1798819833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.proteus_h7.1798819833" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.proteus_h7.1798819833" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_small-can-board.ini b/firmware/tunerstudio/generated/fome_small-can-board.ini index 088e4b50da..c3a023ad5e 100644 --- a/firmware/tunerstudio/generated/fome_small-can-board.ini +++ b/firmware/tunerstudio/generated/fome_small-can-board.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.small-can-board.4091227617" + signature = "rusEFI (FOME) master.2024.07.22.small-can-board.4091227617" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.small-can-board.4091227617" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.small-can-board.4091227617" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false diff --git a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini index 9fae7af268..54a2b27d84 100644 --- a/firmware/tunerstudio/generated/fome_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/fome_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI (FOME) master.2024.07.21.tdg-pdm8.2434340445" + signature = "rusEFI (FOME) master.2024.07.22.tdg-pdm8.2434340445" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI (FOME) master.2024.07.21.tdg-pdm8.2434340445" ; signature is expected to be 7 or more characters. + signature= "rusEFI (FOME) master.2024.07.22.tdg-pdm8.2434340445" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false 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 21f2063037..15f2f8265b 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 @@ -1179,7 +1179,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.07.21.f407-discovery.4210670367"; + public static final String TS_SIGNATURE = "rusEFI (FOME) master.2024.07.22.f407-discovery.4210670367"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TS_TOTAL_OUTPUT_SIZE = 1388; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; From c5b9f5380880efd81557354c1629d6030b92116f Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 21 Jul 2024 22:28:51 -0700 Subject: [PATCH 4/6] cleanup --- firmware/hw_layer/adc/adc_inputs.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index b37de4178f..872ae12670 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -386,8 +386,6 @@ void initAdcInputs() { #endif // EFI_USE_FAST_ADC addConsoleActionI("adc", (VoidInt) printAdcValue); -#else - efiPrintf("ADC disabled"); #endif } From 1245ddcc21c7cf89c25cc5be8d137dd139d95351 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 21 Jul 2024 23:23:52 -0700 Subject: [PATCH 5/6] adc clarity --- .../config/boards/prometheus/efifeatures.h | 4 -- firmware/hw_layer/adc/adc_inputs.cpp | 56 +++++++------------ 2 files changed, 19 insertions(+), 41 deletions(-) diff --git a/firmware/config/boards/prometheus/efifeatures.h b/firmware/config/boards/prometheus/efifeatures.h index 4b16efe98c..fa9a80a077 100644 --- a/firmware/config/boards/prometheus/efifeatures.h +++ b/firmware/config/boards/prometheus/efifeatures.h @@ -67,10 +67,6 @@ #undef CONSOLE_MODE_SWITCH_PORT -//!!!!!!!!!!!!!!! -//#undef EFI_INTERNAL_ADC -//#define EFI_INTERNAL_ADC FALSE - #undef ADC_VCC #define ADC_VCC 3.275f diff --git a/firmware/hw_layer/adc/adc_inputs.cpp b/firmware/hw_layer/adc/adc_inputs.cpp index 872ae12670..373fe67ac4 100644 --- a/firmware/hw_layer/adc/adc_inputs.cpp +++ b/firmware/hw_layer/adc/adc_inputs.cpp @@ -244,30 +244,22 @@ void AdcDevice::enableChannel(adc_channel_e hwChannel) { return; } - int logicChannel = channelCount++; + // hwChannel = which external pin are we using + // adcChannelIndex = which ADC channel are we using + // adcIndex = which index does that get in sampling order + size_t adcChannelIndex = hwChannel - EFI_ADC_0; + size_t adcIndex = channelCount++; - /* TODO: following is correct for STM32 ADC1/2. - * ADC3 has another input to gpio mapping - * and should be handled separately */ - size_t channelAdcIndex = hwChannel - EFI_ADC_0; + internalAdcIndexByHardwareIndex[hwChannel] = adcIndex; + hardwareIndexByIndernalAdcIndex[adcIndex] = hwChannel; - internalAdcIndexByHardwareIndex[hwChannel] = logicChannel; - hardwareIndexByIndernalAdcIndex[logicChannel] = hwChannel; - if (logicChannel < 6) { - m_hwConfig->sqr3 |= channelAdcIndex << (5 * logicChannel); - } else if (logicChannel < 12) { - m_hwConfig->sqr2 |= channelAdcIndex << (5 * (logicChannel - 6)); - } else if (logicChannel < 18) { - m_hwConfig->sqr1 |= channelAdcIndex << (5 * (logicChannel - 12)); + if (adcIndex < 6) { + m_hwConfig->sqr3 |= adcChannelIndex << (5 * adcIndex); + } else if (adcIndex < 12) { + m_hwConfig->sqr2 |= adcChannelIndex << (5 * (adcIndex - 6)); + } else if (adcIndex < 18) { + m_hwConfig->sqr1 |= adcChannelIndex << (5 * (adcIndex - 12)); } -#if ADC_MAX_CHANNELS_COUNT > 16 - else if (logicChannel < 24) { - m_hwConfig->sqr4 |= channelAdcIndex << (5 * (logicChannel - 18)); - } - else if (logicChannel < 30) { - m_hwConfig->sqr5 |= channelAdcIndex << (5 * (logicChannel - 24)); - } -#endif /* ADC_MAX_CHANNELS_COUNT */ } adc_channel_e AdcDevice::getAdcHardwareIndexByInternalIndex(int index) const { @@ -350,27 +342,17 @@ void removeFastAdcChannel(const char *name, adc_channel_e setting) { // Weak link a stub so that every board doesn't have to implement this function __attribute__((weak)) void setAdcChannelOverrides() { } -static void configureInputs() { - memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled)); - - /** - * order of analog channels here is totally random and has no meaning - * we also have some weird implementation with internal indices - that all has no meaning, it's just a random implementation - * which does not mean anything. - */ - - addFastAdcChannel("MAP", engineConfiguration->map.sensor.hwChannel); - addFastAdcChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel); - - setAdcChannelOverrides(); -} - static CCM_OPTIONAL SlowAdcController slowAdcController; void initAdcInputs() { efiPrintf("initAdcInputs()"); - configureInputs(); + memset(adcHwChannelEnabled, 0, sizeof(adcHwChannelEnabled)); + + addFastAdcChannel("MAP", engineConfiguration->map.sensor.hwChannel); + addFastAdcChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel); + + setAdcChannelOverrides(); #if EFI_INTERNAL_ADC portInitAdc(); From bd808552eed0d89d9735cb6248b55121dab9a57a Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 21 Jul 2024 23:25:04 -0700 Subject: [PATCH 6/6] typo --- firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp b/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp index f44d2f0e32..ce3c17077b 100644 --- a/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp +++ b/firmware/hw_layer/ports/stm32/stm32_adc_v2.cpp @@ -185,7 +185,7 @@ static bool readBatch(adcsample_t* convertedSamples) { bool readSlowAnalogInputs(adcsample_t* convertedSamples) { bool result = true; - result &= readBatch(convertedSamples, 0); + result &= readBatch(convertedSamples); #ifdef ADC_MUX_PIN muxControl.setValue(1);