From e59ae35196294e79554ebd6f6184e01c18a53d49 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 18 Apr 2022 11:11:57 -0400 Subject: [PATCH] unique field names --- firmware/console/binary/output_channels.txt | 6 +++--- .../controllers/actuators/electronic_throttle.cpp | 2 +- firmware/controllers/actuators/idle_thread.cpp | 2 +- firmware/controllers/algo/launch_control.cpp | 2 +- .../lua/generated/output_lookup_generated.cpp | 12 ++++++------ 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index 641c4219a6..21c41c3560 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -299,7 +299,7 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0 bit launchActivateSwitchCondition bit launchIsLaunchCondition; bit launchCombinedConditions - bit launchActivatePinState + bit dup_launchActivatePinState bit dfcoActive bit tpsAccelActive @@ -353,13 +353,13 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0 uint8_t starterRelayDisable;;"", 1, 0, -10000, 10000, 3 uint8_t multiSparkCounter;;"", 1, 0, -10000, 10000, 3 - int idleState;;"", 1, 0, -10000, 10000, 3 + int dup_idleState;;"", 1, 0, -10000, 10000, 3 float injectorFlowPressureRatio;;"", 1, 0, -10000, 10000, 3 float injectorFlowPressureDelta;;"kPa", 1, 0, -10000, 10000, 1 - float etbFeedForward;;"%", 1, 0, -10000, 10000, 3 + float dup_etbFeedForward;;"%", 1, 0, -10000, 10000, 3 float etbIntegralError;;"", 1, 0, -10000, 10000, 3 float etbCurrentTarget;;"%", 1, 0, -10000, 10000, 3 pid_status_s alternatorStatus diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp index a0755205de..b50a992ae1 100644 --- a/firmware/controllers/actuators/electronic_throttle.cpp +++ b/firmware/controllers/actuators/electronic_throttle.cpp @@ -545,7 +545,7 @@ void EtbController::update() { // Only debug throttle #1 if (m_function == ETB_Throttle1) { m_pid.postState(engine->outputChannels.etbStatus); - engine->outputChannels.etbFeedForward = engine->engineState.etbFeedForward; + engine->outputChannels.dup_etbFeedForward = engine->engineState.etbFeedForward; engine->outputChannels.etbStatus.output = directPwmValue; } #endif /* EFI_TUNER_STUDIO */ diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp index db611a768b..d2ed2e1f37 100644 --- a/firmware/controllers/actuators/idle_thread.cpp +++ b/firmware/controllers/actuators/idle_thread.cpp @@ -352,7 +352,7 @@ float IdleController::getIdlePosition() { if (engineConfiguration->idleMode == IM_AUTO) { // see also tsOutputChannels->idlePosition getIdlePid()->postState(engine->outputChannels.idleStatus); - engine->outputChannels.idleState = idleState; + engine->outputChannels.dup_idleState = idleState; } else { engine->outputChannels.idleCurrentPosition = iacPosition; extern StepperMotor iacMotor; diff --git a/firmware/controllers/algo/launch_control.cpp b/firmware/controllers/algo/launch_control.cpp index c0fbe47e5c..d39b74182c 100644 --- a/firmware/controllers/algo/launch_control.cpp +++ b/firmware/controllers/algo/launch_control.cpp @@ -125,7 +125,7 @@ void LaunchControlBase::update() { #if EFI_TUNER_STUDIO engine->outputChannels.clutchDownState = engine->clutchDownState; - engine->outputChannels.launchActivatePinState = launchActivatePinState; + engine->outputChannels.dup_launchActivatePinState = launchActivatePinState; engine->outputChannels.launchIsLaunchCondition = isLaunchCondition; engine->outputChannels.launchCombinedConditions = combinedConditions; #endif /* EFI_TUNER_STUDIO */ diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index 1182e2cd89..4f80f2c569 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -370,8 +370,8 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.launchIsLaunchCondition; if (strEqualCaseInsensitive(name, "launchCombinedConditions")) return engine->outputChannels.launchCombinedConditions; - if (strEqualCaseInsensitive(name, "launchActivatePinState")) - return engine->outputChannels.launchActivatePinState; + if (strEqualCaseInsensitive(name, "dup_launchActivatePinState")) + return engine->outputChannels.dup_launchActivatePinState; if (strEqualCaseInsensitive(name, "dfcoActive")) return engine->outputChannels.dfcoActive; if (strEqualCaseInsensitive(name, "tpsAccelActive")) @@ -448,14 +448,14 @@ float getOutputValueByName(const char *name) { return engine->outputChannels.starterRelayDisable; if (strEqualCaseInsensitive(name, "multiSparkCounter")) return engine->outputChannels.multiSparkCounter; - if (strEqualCaseInsensitive(name, "idleState")) - return engine->outputChannels.idleState; + if (strEqualCaseInsensitive(name, "dup_idleState")) + return engine->outputChannels.dup_idleState; if (strEqualCaseInsensitive(name, "injectorFlowPressureRatio")) return engine->outputChannels.injectorFlowPressureRatio; if (strEqualCaseInsensitive(name, "injectorFlowPressureDelta")) return engine->outputChannels.injectorFlowPressureDelta; - if (strEqualCaseInsensitive(name, "etbFeedForward")) - return engine->outputChannels.etbFeedForward; + if (strEqualCaseInsensitive(name, "dup_etbFeedForward")) + return engine->outputChannels.dup_etbFeedForward; if (strEqualCaseInsensitive(name, "etbIntegralError")) return engine->outputChannels.etbIntegralError; if (strEqualCaseInsensitive(name, "etbCurrentTarget"))