From 9909d7e0350ab92ec6df3fef64c1b4560ebb684c Mon Sep 17 00:00:00 2001 From: kifir Date: Tue, 11 Jun 2024 18:46:49 +0300 Subject: [PATCH] get rid of redundant combinedConditions indicator --- firmware/controllers/algo/launch_control.cpp | 2 +- firmware/controllers/algo/launch_control_state.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp index 96c8ceb754..0e8c837e88 100644 --- a/firmware/controllers/algo/launch_control.cpp +++ b/firmware/controllers/algo/launch_control.cpp @@ -118,7 +118,7 @@ void LaunchControlBase::update() { const int rpm = Sensor::getOrZero(SensorType::Rpm); const LaunchCondition launchCondition = calculateLaunchCondition(rpm); - isLaunchCondition = combinedConditions = (launchCondition == LaunchCondition::Launch); + isLaunchCondition = (launchCondition == LaunchCondition::Launch); isPreLaunchCondition = (launchCondition == LaunchCondition::PreLaunch); //and still recalculate in case user changed the values diff --git a/firmware/controllers/algo/launch_control_state.txt b/firmware/controllers/algo/launch_control_state.txt index a80079bb6d..e30d5ece5b 100644 --- a/firmware/controllers/algo/launch_control_state.txt +++ b/firmware/controllers/algo/launch_control_state.txt @@ -2,7 +2,6 @@ struct_no_prefix launch_control_state_s int retardThresholdRpm -bit combinedConditions bit launchActivatePinState bit isPreLaunchCondition bit isLaunchCondition