From 2f907af19816a57f608ed0b615dd9e3a1f4ae583 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 16 Sep 2023 11:03:14 -0400 Subject: [PATCH] Fan not be able to be set because in use at VR PWM fix #5565 only:reducing confusion --- firmware/controllers/algo/engine.cpp | 2 +- firmware/controllers/engine_controller.cpp | 2 +- firmware/controllers/sensors/vr_pwm.cpp | 10 +++++----- firmware/controllers/sensors/vr_pwm.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp index 36a8085825..742ad4db45 100644 --- a/firmware/controllers/algo/engine.cpp +++ b/firmware/controllers/algo/engine.cpp @@ -149,7 +149,7 @@ void Engine::periodicSlowCallback() { tpsAccelEnrichment.onNewValue(Sensor::getOrZero(SensorType::Tps1)); - updateVrPwm(); + updateVrThresholdPwm(); enginePins.o2heater.setValue(engineConfiguration->forceO2Heating || engine->rpmCalculator.isRunning()); enginePins.starterRelayDisable.setValue(Sensor::getOrZero(SensorType::Rpm) < engineConfiguration->cranking.rpm); diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp index bcecec073c..8890338c2b 100644 --- a/firmware/controllers/engine_controller.cpp +++ b/firmware/controllers/engine_controller.cpp @@ -674,7 +674,7 @@ void initEngineController() { engineStateBlinkingTask.start(); - initVrPwm(); + initVrThresholdPwm(); #if EFI_PWM_TESTER initPwmTester(); diff --git a/firmware/controllers/sensors/vr_pwm.cpp b/firmware/controllers/sensors/vr_pwm.cpp index 52ddb362c9..b346de635f 100644 --- a/firmware/controllers/sensors/vr_pwm.cpp +++ b/firmware/controllers/sensors/vr_pwm.cpp @@ -10,7 +10,7 @@ static SimplePwm pwms[VR_THRESHOLD_COUNT]; #define VR_SUPPLY_VOLTAGE 3.3f #endif -static void updateVrPwm(int rpm, size_t index) { +static void updateVrThresholdPwm(int rpm, size_t index) { auto& cfg = engineConfiguration->vrThreshold[index]; if (!isBrainPinValid(cfg.pin)) { @@ -28,15 +28,15 @@ static void updateVrPwm(int rpm, size_t index) { pwms[index].setSimplePwmDutyCycle(duty); } -void updateVrPwm() { +void updateVrThresholdPwm() { auto rpm = Sensor::getOrZero(SensorType::Rpm); for (size_t i = 0; i < efi::size(engineConfiguration->vrThreshold); i++) { - updateVrPwm(rpm, i); + updateVrThresholdPwm(rpm, i); } } -void initVrPwm() { +void initVrThresholdPwm() { for (size_t i = 0; i < efi::size(engineConfiguration->vrThreshold); i++) { auto& cfg = engineConfiguration->vrThreshold[i]; @@ -44,7 +44,7 @@ void initVrPwm() { continue; } - startSimplePwmHard(&pwms[i], "VR PWM", + startSimplePwmHard(&pwms[i], "VR Threshold", &engine->executor, cfg.pin, &pins[i], diff --git a/firmware/controllers/sensors/vr_pwm.h b/firmware/controllers/sensors/vr_pwm.h index 5ebfd5e587..3023d91bf1 100644 --- a/firmware/controllers/sensors/vr_pwm.h +++ b/firmware/controllers/sensors/vr_pwm.h @@ -1,5 +1,5 @@ #pragma once -void initVrPwm(); -void updateVrPwm(); +void initVrThresholdPwm(); +void updateVrThresholdPwm(); void setDefaultVrThresholds();