From 4849f7bdfa63113902e7f9f2505a2e5a4427290c Mon Sep 17 00:00:00 2001 From: pchmura4 Date: Sun, 22 Oct 2023 15:26:44 -0400 Subject: [PATCH] Corrections for the build to succeed --- firmware/controllers/actuators/idle_state.txt | 2 +- firmware/controllers/actuators/idle_thread.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/controllers/actuators/idle_state.txt b/firmware/controllers/actuators/idle_state.txt index ddfdc8258b..bb482d6ff0 100644 --- a/firmware/controllers/actuators/idle_state.txt +++ b/firmware/controllers/actuators/idle_state.txt @@ -32,7 +32,7 @@ custom idle_state_e 4 bits, S32, @OFFSET@, [0:2], "not important" int idleTarget;Idle: Target RPM int targetRpmByClt;Idle: Target RPM base - int targetRpmAcBump;Idle: Target A/C bump + int targetRpmAc;Idle: Target A/C RPM percent_t iacByRpmTaper;idle: iacByRpmTaper portion diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index 296d242584..96807f306b 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -30,9 +30,9 @@ int IdleController::getTargetRpm(float clt) { // Why do we bump based on button not based on actual A/C relay state? // Because AC output has a delay to allow idle bump to happen first, so that the airflow increase gets a head start on the load increase // alternator duty cycle has a similar logic - targetRpmAcTarget = engine->module().unmock().acButtonState ? engineConfiguration->acIdleRpmTarget : 0; + targetRpmAc = engine->module().unmock().acButtonState ? engineConfiguration->acIdleRpmTarget : 0; - auto target = (targetRpmByClt < targetRpmAcTarget) ? targetRpmAcTarget : targetRpmByClt; + auto target = (targetRpmByClt < targetRpmAc) ? targetRpmAc : targetRpmByClt; idleTarget = target; return target; }