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

idle indicators (#2692) 

* add coasting bit

* remove useless bit
This commit is contained in:
Matthew Kennedy 2021-05-13 14:35:00 -07:00 committed by GitHub
parent 62cbc6db91
commit 13d2ee03bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ typedef struct {
unsigned int hasSdCard : 1; // bit 0, 72 unsigned int hasSdCard : 1; // bit 0, 72
unsigned int isIgnitionEnabledIndicator : 1; // bit 1 unsigned int isIgnitionEnabledIndicator : 1; // bit 1
unsigned int isInjectionEnabledIndicator : 1; // bit 2 unsigned int isInjectionEnabledIndicator : 1; // bit 2
unsigned int isCylinderCleanupEnabled : 1; // bit 3 unsigned int unusedb3 : 1; // bit 3
unsigned int isCylinderCleanupActivated : 1; // bit 4 unsigned int isCylinderCleanupActivated : 1; // bit 4
unsigned int isFuelPumpOn : 1; // bit 5 unsigned int isFuelPumpOn : 1; // bit 5
unsigned int isFanOn : 1; // bit 6 unsigned int isFanOn : 1; // bit 6
@ -80,6 +80,7 @@ typedef struct {
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 unsigned int isIdleClosedLoop : 1; // bit 30
unsigned int isIdleCoasting : 1; // bit 31
// RPM, vss // RPM, vss
scaled_channel<uint16_t> rpm; // 4 scaled_channel<uint16_t> rpm; // 4

1
firmware/console/status_loop.cpp
View File

@ -699,7 +699,6 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue(); tsOutputChannels->isO2HeaterOn = enginePins.o2heater.getLogicValue();
tsOutputChannels->isIgnitionEnabledIndicator = ENGINE(limpManager).allowIgnition(); tsOutputChannels->isIgnitionEnabledIndicator = ENGINE(limpManager).allowIgnition();
tsOutputChannels->isInjectionEnabledIndicator = ENGINE(limpManager).allowInjection(); tsOutputChannels->isInjectionEnabledIndicator = ENGINE(limpManager).allowInjection();
tsOutputChannels->isCylinderCleanupEnabled = engineConfiguration->isCylinderCleanupEnabled;
tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode; tsOutputChannels->isCylinderCleanupActivated = engine->isCylinderCleanupMode;
#if EFI_VEHICLE_SPEED #if EFI_VEHICLE_SPEED

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

@ -535,7 +535,8 @@ static percent_t automaticIdleController(float tpsPos, float rpm, int targetRpm,
} }
#if EFI_TUNER_STUDIO #if EFI_TUNER_STUDIO
tsOutputChannels.isIdleClosedLoop = phase == Phase::Idling && CONFIG(idleMode) == IM_AUTO; tsOutputChannels.isIdleClosedLoop = phase == Phase::Idling;
tsOutputChannels.isIdleCoasting = phase == Phase::Coasting;
if (engineConfiguration->debugMode == DBG_IDLE_CONTROL) { if (engineConfiguration->debugMode == DBG_IDLE_CONTROL) {
if (engineConfiguration->idleMode == IM_AUTO) { if (engineConfiguration->idleMode == IM_AUTO) {

7
firmware/tunerstudio/rusefi.input
View File

@ -179,8 +179,7 @@ enable2ndByteCanID = false
; Bit flags ; Bit flags
hasSdCard = bits, U32, 0, [0:0], "true", "false"; hasSdCard = bits, U32, 0, [0:0], "true", "false";
isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false"; isIgnitionEnabledIndicator=bits,U32, 0, [1:1], "true", "false";
isInjectionEnabledIndicator=bits,U32, 0, [2:2], "true", "false"; isInjectionEnabledIndicator=bits,U32,0, [2:2], "true", "false";
isCylinderCleanupEnabled=bits,U32, 0, [3:3], "true", "false";
isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false"; isCylinderCleanupActivated=bits,U32, 0, [4:4], "true", "false";
ind_fuel_pump = bits, U32, 0, [5:5], "true", "false"; ind_fuel_pump = bits, U32, 0, [5:5], "true", "false";
ind_fan = bits, U32, 0, [6:6], "true", "false"; ind_fan = bits, U32, 0, [6:6], "true", "false";
@ -206,6 +205,7 @@ enable2ndByteCanID = 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"; isIdleClosedLoop= bits, U32, 0, [30:30], "true", "false";
isIdleCoasting = bits, U32, 0, [31:31], "true", "false";
; RPM, vss ; RPM, vss
RPMValue = scalar, U16, 4, "RPM", 1, 0.00000 RPMValue = scalar, U16, 4, "RPM", 1, 0.00000
@ -1198,7 +1198,8 @@ 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 indicator = { isIdleClosedLoop }, "not idling", "idling", white, black, green, black
indicator = { isIdleCoasting }, "not coasting", "coasting", 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