FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

actually let's remove the duplicates

This commit is contained in:
rusefillc 2022-04-18 11:43:49 -04:00
parent 5f9c9d1732
commit b252533889
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/console/binary/output_channels.txt
View File

@ -299,7 +299,6 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0
bit launchActivateSwitchCondition bit launchActivateSwitchCondition
bit launchIsLaunchCondition; bit launchIsLaunchCondition;
bit launchCombinedConditions bit launchCombinedConditions
bit dup_launchActivatePinState
bit dfcoActive bit dfcoActive
bit tpsAccelActive bit tpsAccelActive
@ -353,13 +352,10 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0
uint8_t starterRelayDisable;;"", 1, 0, -10000, 10000, 3 uint8_t starterRelayDisable;;"", 1, 0, -10000, 10000, 3
uint8_t multiSparkCounter;;"", 1, 0, -10000, 10000, 3 uint8_t multiSparkCounter;;"", 1, 0, -10000, 10000, 3
int dup_idleState;;"", 1, 0, -10000, 10000, 3
float injectorFlowPressureRatio;;"", 1, 0, -10000, 10000, 3 float injectorFlowPressureRatio;;"", 1, 0, -10000, 10000, 3
float injectorFlowPressureDelta;;"kPa", 1, 0, -10000, 10000, 1 float injectorFlowPressureDelta;;"kPa", 1, 0, -10000, 10000, 1
float dup_etbFeedForward;;"%", 1, 0, -10000, 10000, 3
float etbIntegralError;;"", 1, 0, -10000, 10000, 3 float etbIntegralError;;"", 1, 0, -10000, 10000, 3
float etbCurrentTarget;;"%", 1, 0, -10000, 10000, 3 float etbCurrentTarget;;"%", 1, 0, -10000, 10000, 3
pid_status_s alternatorStatus pid_status_s alternatorStatus
@ -370,5 +366,5 @@ uint16_t rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 0
uint16_t auxSpeed1;"aux speed 1";"s",1, 0, 0, 0, 0 uint16_t auxSpeed1;"aux speed 1";"s",1, 0, 0, 0, 0
uint16_t auxSpeed2;"aux speed 2";"s",1, 0, 0, 0, 0 uint16_t auxSpeed2;"aux speed 2";"s",1, 0, 0, 0, 0
uint8_t[72 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0 uint8_t[80 iterate] unusedAtTheEnd;;"",1, 0, 0, 0, 0
end_struct end_struct

1
firmware/controllers/actuators/electronic_throttle.cpp
View File

@ -545,7 +545,6 @@ void EtbController::update() {
// Only debug throttle #1 // Only debug throttle #1
if (m_function == ETB_Throttle1) { if (m_function == ETB_Throttle1) {
m_pid.postState(engine->outputChannels.etbStatus); m_pid.postState(engine->outputChannels.etbStatus);
engine->outputChannels.dup_etbFeedForward = engine->engineState.etbFeedForward;
engine->outputChannels.etbStatus.output = directPwmValue; engine->outputChannels.etbStatus.output = directPwmValue;
} }
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */

1
firmware/controllers/actuators/idle_thread.cpp
View File

@ -352,7 +352,6 @@ float IdleController::getIdlePosition() {
if (engineConfiguration->idleMode == IM_AUTO) { if (engineConfiguration->idleMode == IM_AUTO) {
// see also tsOutputChannels->idlePosition // see also tsOutputChannels->idlePosition
getIdlePid()->postState(engine->outputChannels.idleStatus); getIdlePid()->postState(engine->outputChannels.idleStatus);
engine->outputChannels.dup_idleState = idleState;
} else { } else {
engine->outputChannels.idleCurrentPosition = iacPosition; engine->outputChannels.idleCurrentPosition = iacPosition;
extern StepperMotor iacMotor; extern StepperMotor iacMotor;

1
firmware/controllers/algo/launch_control.cpp
View File

@ -125,7 +125,6 @@ void LaunchControlBase::update() {
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
engine->outputChannels.clutchDownState = engine->clutchDownState; engine->outputChannels.clutchDownState = engine->clutchDownState;
engine->outputChannels.dup_launchActivatePinState = launchActivatePinState;
engine->outputChannels.launchIsLaunchCondition = isLaunchCondition; engine->outputChannels.launchIsLaunchCondition = isLaunchCondition;
engine->outputChannels.launchCombinedConditions = combinedConditions; engine->outputChannels.launchCombinedConditions = combinedConditions;
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */