From dc769e7a2a1e5ee5115f88c00adedefe61295a78 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 23 Mar 2020 23:15:44 -0400 Subject: [PATCH] progress --- firmware/controllers/actuators/boost_control.cpp | 2 ++ firmware/hw_layer/adc_inputs.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/actuators/boost_control.cpp b/firmware/controllers/actuators/boost_control.cpp index fd1822b1ac..ce55455f4b 100644 --- a/firmware/controllers/actuators/boost_control.cpp +++ b/firmware/controllers/actuators/boost_control.cpp @@ -171,7 +171,9 @@ void startBoostPin(void) { } void stopBoostPin(void) { +#if !EFI_UNIT_TEST brain_pin_markUnused(activeConfiguration.boostControlPin); +#endif /* EFI_UNIT_TEST */ } void onConfigurationChangeBoostCallback(engine_configuration_s *previousConfiguration) { diff --git a/firmware/hw_layer/adc_inputs.cpp b/firmware/hw_layer/adc_inputs.cpp index 8854620f6f..fc8bad8a52 100644 --- a/firmware/hw_layer/adc_inputs.cpp +++ b/firmware/hw_layer/adc_inputs.cpp @@ -520,17 +520,19 @@ static void configureInputs(void) { addChannel("IAT", engineConfiguration->iat.adcChannel, ADC_SLOW); addChannel("AUXT#1", engineConfiguration->auxTempSensor1.adcChannel, ADC_SLOW); addChannel("AUXT#2", engineConfiguration->auxTempSensor2.adcChannel, ADC_SLOW); - if (engineConfiguration->auxFastSensor1_adcChannel != EFI_ADC_0) { + if (engineConfiguration->auxFastSensor1_adcChannel != INCOMPATIBLE_CONFIG_CHANGE) { // allow EFI_ADC_0 next time we have an incompatible configuration change addChannel("AUXF#1", engineConfiguration->auxFastSensor1_adcChannel, ADC_FAST); } addChannel("AFR", engineConfiguration->afr.hwChannel, ADC_SLOW); addChannel("OilP", engineConfiguration->oilPressure.hwChannel, ADC_SLOW); addChannel("AC", engineConfiguration->acSwitchAdc, ADC_SLOW); - if (engineConfiguration->high_fuel_pressure_sensor_1 != INCOMPATIBLE_CONFIG_CHANGE) + if (engineConfiguration->high_fuel_pressure_sensor_1 != INCOMPATIBLE_CONFIG_CHANGE) { addChannel("HFP1", engineConfiguration->high_fuel_pressure_sensor_1, ADC_SLOW); - if (engineConfiguration->high_fuel_pressure_sensor_2 != INCOMPATIBLE_CONFIG_CHANGE) + } + if (engineConfiguration->high_fuel_pressure_sensor_2 != INCOMPATIBLE_CONFIG_CHANGE) { addChannel("HFP2", engineConfiguration->high_fuel_pressure_sensor_2, ADC_SLOW); + } if (CONFIG(isCJ125Enabled)) { addChannel("cj125ur", engineConfiguration->cj125ur, ADC_SLOW);