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

show when idle is closed loop (#2160) 

* show when idle is closed loop

* semicolon

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2020-12-30 05:42:40 -08:00 committed by GitHub
parent 5b638d3a87
commit 342414a5f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/console/binary/tunerstudio_outputs.h
View File

@ -79,6 +79,7 @@ typedef struct {
unsigned int isKnockChipOk : 1; // bit 27 unsigned int isKnockChipOk : 1; // bit 27
unsigned int launchTriggered : 1; // bit 28 unsigned int launchTriggered : 1; // bit 28
unsigned int isTps2Error : 1; // bit 29 unsigned int isTps2Error : 1; // bit 29
unsigned int isIdleClosedLoop : 1; // bit 30
// RPM, vss // RPM, vss
scaled_channel<uint16_t> rpm; // 4 scaled_channel<uint16_t> rpm; // 4

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

@ -522,22 +522,21 @@ static percent_t automaticIdleController(float tpsPos, float rpm, int targetRpm,
engine->rpmCalculator.getRevolutionCounterSinceStart()); engine->rpmCalculator.getRevolutionCounterSinceStart());
} }
#if EFI_TUNER_STUDIO
tsOutputChannels.isIdleClosedLoop = phase == Phase::Idling && CONFIG(idleMode) == IM_AUTO;
if (engineConfiguration->debugMode == DBG_IDLE_CONTROL) { if (engineConfiguration->debugMode == DBG_IDLE_CONTROL) {
if (engineConfiguration->idleMode == IM_AUTO) { if (engineConfiguration->idleMode == IM_AUTO) {
#if EFI_TUNER_STUDIO
// see also tsOutputChannels->idlePosition // see also tsOutputChannels->idlePosition
getIdlePid(PASS_ENGINE_PARAMETER_SIGNATURE)->postState(&tsOutputChannels, 1000000); getIdlePid(PASS_ENGINE_PARAMETER_SIGNATURE)->postState(&tsOutputChannels, 1000000);
tsOutputChannels.debugIntField4 = engine->engineState.idle.idleState; tsOutputChannels.debugIntField4 = engine->engineState.idle.idleState;
#endif /* EFI_TUNER_STUDIO */
} else { } else {
#if EFI_TUNER_STUDIO
tsOutputChannels.debugFloatField1 = iacPosition; tsOutputChannels.debugFloatField1 = iacPosition;
extern StepperMotor iacMotor; extern StepperMotor iacMotor;
tsOutputChannels.debugIntField1 = iacMotor.getTargetPosition(); tsOutputChannels.debugIntField1 = iacMotor.getTargetPosition();
#endif /* EFI_TUNER_STUDIO */
} }
} }
#endif /* EFI_TUNER_STUDIO */
engine->engineState.idle.currentIdlePosition = iacPosition; engine->engineState.idle.currentIdlePosition = iacPosition;

2
firmware/tunerstudio/rusefi.input
View File

@ -205,6 +205,7 @@ enable2ndByteCanID = false
ind_isWarnNow =bits, U32, 0, [25:25], "true", "false"; ind_isWarnNow =bits, U32, 0, [25:25], "true", "false";
ind_pedal_error =bits, U32, 0, [26:26], "true", "false"; ind_pedal_error =bits, U32, 0, [26:26], "true", "false";
isTps2Error = bits, U32, 0, [29:29], "true", "false"; isTps2Error = bits, U32, 0, [29:29], "true", "false";
isIdleClosedLoop= bits, U32, 0, [30:30], "true", "false";
; RPM, vss ; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000 RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
@ -1153,6 +1154,7 @@ gaugeCategory = DynoView
indicator = { clutchDownState }, "clutch", "cltch Down", white, black, yellow, black indicator = { clutchDownState }, "clutch", "cltch Down", white, black, yellow, black
indicator = { brakePedalIndicator }, "brake", "brake down", white, black, red, black indicator = { brakePedalIndicator }, "brake", "brake down", white, black, red, black
indicator = { acSwitchState }, "AC off", "AC on", white, black, blue, white indicator = { acSwitchState }, "AC off", "AC on", white, black, blue, white
indicator = { isIdleClosedLoop }, "idle open loop", "idle closed loop", white, black, green, black
; error codes ; error codes
indicator = { isTpsError}, "tps", "tps error", white, black, red, black indicator = { isTpsError}, "tps", "tps error", white, black, red, black