From 4a84cf5fee081f8a5872da254f82ef5c5b178eee Mon Sep 17 00:00:00 2001 From: rusEFI LLC Date: Tue, 29 Oct 2024 09:28:37 -0400 Subject: [PATCH] Void initLambda() always registers Lambda sensors fix #7007 --- firmware/init/sensor/init_lambda.cpp | 15 +++++++++++++-- firmware/tunerstudio/tunerstudio.template.ini | 5 ++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/firmware/init/sensor/init_lambda.cpp b/firmware/init/sensor/init_lambda.cpp index 03e9d68a97..f978747c26 100644 --- a/firmware/init/sensor/init_lambda.cpp +++ b/firmware/init/sensor/init_lambda.cpp @@ -65,6 +65,17 @@ void initLambda() { } #endif - lambdaSensor.Register(); - lambdaSensor2.Register(); +#if EFI_UNIT_TEST + constexpr bool isUnitTest = true; +#else + constexpr bool isUnitTest = false; +#endif + + // CANbus option is handled above, let's handle analog inputs conditionally to give Lua sensors a chance + if (isAdcChannelValid(engineConfiguration->afr.hwChannel) || isUnitTest) { + lambdaSensor.Register(); + } + if (isAdcChannelValid(engineConfiguration->afr.hwChannel2) || isUnitTest) { + lambdaSensor2.Register(); + } } diff --git a/firmware/tunerstudio/tunerstudio.template.ini b/firmware/tunerstudio/tunerstudio.template.ini index 7d4a162824..fa58b7cbc0 100644 --- a/firmware/tunerstudio/tunerstudio.template.ini +++ b/firmware/tunerstudio/tunerstudio.template.ini @@ -297,6 +297,9 @@ enable2ndByteCanID = false maintainConstantValue = throttlePedalWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue : throttlePedalWOTVoltage } maintainConstantValue = throttlePedalSecondaryWOTVoltage, { (calibrationMode == @@TsCalMode_PedalMax@@ ) ? calibrationValue2 : throttlePedalSecondaryWOTVoltage } + requiresPowerCycle = afr_hwChannel + requiresPowerCycle = afr_hwChannel2 + requiresPowerCycle = gppwm1_pin requiresPowerCycle = gppwm2_pin requiresPowerCycle = gppwm3_pin @@ -2151,7 +2154,7 @@ menuDialog = main groupChildMenu = speedSensor, "Vehicle speed sensor"@@if_ts_show_vehicle_speed_sensor groupChildMenu = ambientTempSensor, "Ambient temp sensor", { 1 }, { uiMode == @@UiMode_FULL@@ || uiMode == @@UiMode_INSTALLATION@@ } groupChildMenu = acPressureSensor, "A/C Pressure"@@if_ts_show_air_conditioning - + # Base analog input settings subMenu = analogInputSettings, "Analog input settings", { 1 }, { uiMode == @@UiMode_FULL@@ || uiMode == @@UiMode_INSTALLATION@@ }@@if_ts_show_analog_input_settings subMenu = std_separator