andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unique field names

This commit is contained in:
rusefillc 2022-04-18 11:11:57 -04:00
parent a6d3b2f028
commit e59ae35196
5 changed files with 12 additions and 12 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,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

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

@ -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 */

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

@ -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;

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

@ -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 */

12
firmware/controllers/lua/generated/output_lookup_generated.cpp
View File

@ -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"))