From 241f2765e9c6ba94bac020cfe6393aa00413f502 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 29 Jun 2022 01:49:48 -0400 Subject: [PATCH] logging of live data structs was: data points #3614 --- firmware/controllers/algo/launch_control.cpp | 12 +----------- firmware/integration/LiveData.yaml | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp index 6c07d59eb0..a863404601 100644 --- a/firmware/controllers/algo/launch_control.cpp +++ b/firmware/controllers/algo/launch_control.cpp @@ -85,14 +85,6 @@ bool LaunchControlBase::isLaunchConditionMet(int rpm) { speedCondition = isInsideSpeedCondition(); tpsCondition = isInsideTpsCondition(); -#if EFI_TUNER_STUDIO - // todo: implement fancy logging of all live data - engine->outputChannels.launchSpeedCondition = speedCondition; - engine->outputChannels.launchRpmCondition = rpmCondition; - engine->outputChannels.launchTpsCondition = tpsCondition; - engine->outputChannels.launchActivateSwitchCondition = activateSwitchCondition; -#endif /* EFI_TUNER_STUDIO */ - return speedCondition && activateSwitchCondition && rpmCondition && tpsCondition; } @@ -110,7 +102,7 @@ void LaunchControlBase::update() { combinedConditions = isLaunchConditionMet(rpm); //and still recalculate in case user changed the values - retardThresholdRpm = engineConfiguration->launchRpm + (engineConfiguration->enableLaunchRetard ? + retardThresholdRpm = engineConfiguration->launchRpm + (engineConfiguration->enableLaunchRetard ? engineConfiguration->launchAdvanceRpmRange : 0) + engineConfiguration->hardCutRpmRange; if (!combinedConditions) { @@ -124,8 +116,6 @@ void LaunchControlBase::update() { #if EFI_TUNER_STUDIO engine->outputChannels.clutchDownState = engine->clutchDownState; - engine->outputChannels.launchIsLaunchCondition = isLaunchCondition; - engine->outputChannels.launchCombinedConditions = combinedConditions; #endif /* EFI_TUNER_STUDIO */ } diff --git a/firmware/integration/LiveData.yaml b/firmware/integration/LiveData.yaml index e8789adfdd..a2c386990f 100644 --- a/firmware/integration/LiveData.yaml +++ b/firmware/integration/LiveData.yaml @@ -70,6 +70,7 @@ Usages: - name: engine_state java: EngineState.java folder: controllers/algo + prepend: integration/rusefi_config.txt - name: tps_accel_state java: TpsAccelState.java