From 5fbe108258cd7bff5619ac14fa2dd5456659de0e Mon Sep 17 00:00:00 2001 From: rusefillc <48498823+rusefillc@users.noreply.github.com> Date: Sun, 18 Sep 2022 17:51:23 -0400 Subject: [PATCH] dual.ini: gauge and indicator showing heater state (#160) Co-authored-by: Andrey Gusakov --- firmware/ini/rusefi_wb_f1_dual.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/firmware/ini/rusefi_wb_f1_dual.ini b/firmware/ini/rusefi_wb_f1_dual.ini index 1e3cdfb..e62e904 100644 --- a/firmware/ini/rusefi_wb_f1_dual.ini +++ b/firmware/ini/rusefi_wb_f1_dual.ini @@ -131,6 +131,7 @@ AFR0_PumpITarget = scalar, F32, 44, "mA", 1, 0, -5.0, 5.0, 2 AFR0_PumpIMeasure = scalar, F32, 48, "mA", 1, 0, -5.0, 5.0, 2 AFR0_HeaterDuty = scalar, F32, 52, "%", 100, 0, 0.0, 100.0, 0 AFR0_fault = scalar, U08, 56, "", 1, 0, 0, 6, 0 +AFR0_heater = scalar, U08, 57, "", 1, 0, 0, 4, 0 ; AFR1 AFR1_in = scalar, F32, 64, "", 14.7, 0, 0.0, 20.0, 2 @@ -140,6 +141,7 @@ AFR1_PumpITarget = scalar, F32, 76, "mA", 1, 0, -5.0, 5.0, 2 AFR1_PumpIMeasure = scalar, F32, 80, "mA", 1, 0, -5.0, 5.0, 2 AFR1_HeaterDuty = scalar, F32, 84, "%", 100, 0, 0.0, 100.0, 0 AFR1_fault = scalar, U08, 88, "", 1, 0, 0, 6, 0 +AFR1_heater = scalar, U08, 89, "", 1, 0, 0, 4, 0 ; EGT0 EGT0_temp = scalar, F32, 96, "C", 1, 0, -250.0, 1600.0, 0 @@ -158,6 +160,8 @@ seconds = scalar, U32, 124, "sec", 1, 0 EgtStatesList = bits, U08, [0:7], "Ok", "Open Circuit", "Short to GND", "Short to VCC", "No reply" ; Keep in sync with WBO::Fault from ../for_rusefi/wideband_can.h AfrFaultList = bits, U08, [0:7], "Ok", "Unk", "Unk", "Failed to heat", "Overheat", "Underheat", "No supply" + ; Keep in sync with HeaterState from heater_control.h + HeaterStatesList = bits, U08, [0:7], "Preheat", "Warmup", "Close loop", "Stopped", "No supply" [TableEditor] @@ -179,6 +183,7 @@ AFR0_HeaterDutyGauge = AFR0_HeaterDuty, "0: Heater", "%", AFR0_PumpITargetGauge = AFR0_PumpITarget, "0: Ipump Target", "mA", -5.0, 5.0, -4.0, -3.0, 3.0, 4.0, 2, 2 AFR0_PumpIMeasureGauge = AFR0_PumpIMeasure, "0: Ipump Actual", "mA", -5.0, 5.0, -4.0, -3.0, 3.0, 4.0, 2, 2 AFR0_FaultGauge = AFR0_fault, "0: AFR fault", "", 0.0, 6.0, 0.0, 0.0, 0.5, 0.5, 2, 2 +AFR0_HeaterGauge = AFR0_heater, "0: AFR heater state", "", 0.0, 4.0, 0.0, 1.5, 2.5, 2.5, 2, 2 ; AFR1 gaugeCategory = AFR channel 1 @@ -190,6 +195,7 @@ AFR1_HeaterDutyGauge = AFR1_HeaterDuty, "1: Heater", "%", AFR1_PumpITargetGauge = AFR1_PumpITarget, "1: Ipump Target", "mA", -5.0, 5.0, -4.0, -3.0, 3.0, 4.0, 2, 2 AFR1_PumpIMeasureGauge = AFR1_PumpIMeasure, "1: Ipump Actual", "mA", -5.0, 5.0, -4.0, -3.0, 3.0, 4.0, 2, 2 AFR1_FaultGauge = AFR1_fault, "1: AFR fault", "", 0.0, 6.0, 0.0, 0.0, 0.5, 0.5, 2, 2 +AFR1_HeaterGauge = AFR1_heater, "1: AFR heater state", "", 0.0, 4.0, 0.0, 1.5, 2.5, 2.5, 2, 2 ; EGT0 gaugeCategory = EGT channel 0 @@ -222,7 +228,9 @@ EGT1_StateGauge = EGT1_state, "1: EGT state", "", indicator = { EGT0_state }, "EGT0 ok", { EGT0: bitStringValue(EgtStatesList, EGT0_state)}, green, black, red, black indicator = { AFR0_fault }, "AFR0 ok", { AFR0: bitStringValue(AfrFaultList, AFR0_fault)}, green, black, red, black + indicator = { (AFR0_heater != 2) }, "AFR0 Heater CL", { AFR0 heater: bitStringValue(HeaterStatesList, AFR0_heater)}, green, black, red, black + indicator = { (AFR1_heater != 2) }, "AFR1 Heater CL", { AFR1 heater: bitStringValue(HeaterStatesList, AFR1_heater)}, green, black, red, black indicator = { AFR1_fault }, "AFR1 ok", { AFR1: bitStringValue(AfrFaultList, AFR1_fault)}, green, black, red, black indicator = { EGT1_state }, "EGT1 ok", { EGT1: bitStringValue(EgtStatesList, EGT1_state)}, green, black, red, black