From a1fe5100f25bbbab4bdaacb26ec8a1291f787618 Mon Sep 17 00:00:00 2001 From: GitHub gen-configs Action Date: Fri, 17 Jan 2025 23:03:25 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../console/binary/generated/data_logs.ini | 230 ++++++------- firmware/console/binary/generated/gauges.ini | 20 +- .../generated/rusefi_generated_alphax-2chan.h | 4 +- .../generated/rusefi_generated_alphax-4chan.h | 4 +- .../rusefi_generated_alphax-4chan_f7.h | 4 +- .../rusefi_generated_alphax-4k-gdi.h | 4 +- .../rusefi_generated_alphax-8chan-revA.h | 4 +- .../generated/rusefi_generated_alphax-8chan.h | 4 +- .../rusefi_generated_alphax-8chan_f7.h | 4 +- .../rusefi_generated_alphax-silver.h | 4 +- .../rusefi_generated_at_start_f435.h | 4 +- .../generated/rusefi_generated_atlas.h | 4 +- .../rusefi_generated_f407-discovery.h | 4 +- .../rusefi_generated_f429-discovery.h | 4 +- .../rusefi_generated_f469-discovery.h | 4 +- .../rusefi_generated_frankenso_na6.h | 4 +- .../generated/rusefi_generated_haba208.h | 4 +- .../rusefi_generated_hellen-112-17.h | 4 +- .../rusefi_generated_hellen-gm-e67.h | 4 +- .../rusefi_generated_hellen-honda-k.h | 4 +- .../generated/rusefi_generated_hellen-nb1.h | 4 +- .../rusefi_generated_hellen121nissan.h | 4 +- .../generated/rusefi_generated_hellen121vag.h | 4 +- .../generated/rusefi_generated_hellen128.h | 4 +- .../rusefi_generated_hellen154hyundai.h | 4 +- .../rusefi_generated_hellen154hyundai_f7.h | 4 +- .../generated/rusefi_generated_hellen72.h | 4 +- .../generated/rusefi_generated_hellen81.h | 4 +- .../generated/rusefi_generated_hellen88bmw.h | 4 +- .../generated/rusefi_generated_hellenNA6.h | 4 +- .../generated/rusefi_generated_hellenNA8_96.h | 4 +- .../generated/rusefi_generated_m74_9.h | 4 +- .../rusefi_generated_mre-legacy_f4.h | 4 +- .../generated/rusefi_generated_mre_f4.h | 4 +- .../generated/rusefi_generated_mre_f7.h | 4 +- .../generated/rusefi_generated_nucleo_f413.h | 4 +- .../generated/rusefi_generated_proteus_f4.h | 4 +- .../generated/rusefi_generated_proteus_f7.h | 4 +- .../generated/rusefi_generated_proteus_h7.h | 4 +- .../generated/rusefi_generated_s105.h | 4 +- .../rusefi_generated_small-can-board.h | 4 +- .../rusefi_generated_stm32f429_nucleo.h | 4 +- .../rusefi_generated_stm32f767_nucleo.h | 4 +- .../rusefi_generated_stm32h743_nucleo.h | 4 +- .../rusefi_generated_subaru_eg33_f7.h | 4 +- .../generated/rusefi_generated_t-b-g.h | 4 +- .../generated/rusefi_generated_tdg-pdm8.h | 4 +- .../generated/rusefi_generated_uaefi.h | 4 +- .../generated/rusefi_generated_uaefi121.h | 4 +- .../generated/signature_alphax-2chan.h | 4 +- .../generated/signature_alphax-4chan.h | 4 +- .../generated/signature_alphax-4chan_f7.h | 4 +- .../generated/signature_alphax-4k-gdi.h | 4 +- .../generated/signature_alphax-8chan-revA.h | 4 +- .../generated/signature_alphax-8chan.h | 4 +- .../generated/signature_alphax-8chan_f7.h | 4 +- .../generated/signature_alphax-silver.h | 4 +- .../generated/signature_at_start_f435.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f407-discovery.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_f469-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../controllers/generated/signature_haba208.h | 4 +- .../generated/signature_hellen-112-17.h | 4 +- .../generated/signature_hellen-gm-e67.h | 4 +- .../generated/signature_hellen-honda-k.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen154hyundai_f7.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen81.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellenNA8_96.h | 4 +- .../controllers/generated/signature_m74_9.h | 4 +- .../generated/signature_mre-legacy_f4.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_nucleo_f413.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_proteus_h7.h | 4 +- .../controllers/generated/signature_s105.h | 4 +- .../generated/signature_small-can-board.h | 4 +- .../generated/signature_stm32f429_nucleo.h | 4 +- .../generated/signature_stm32f767_nucleo.h | 4 +- .../generated/signature_stm32h743_nucleo.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- .../controllers/generated/signature_t-b-g.h | 4 +- .../generated/signature_tdg-pdm8.h | 4 +- .../controllers/generated/signature_uaefi.h | 4 +- .../generated/signature_uaefi121.h | 4 +- firmware/tunerstudio/generated/rusefi.ini | 308 +++++++++--------- .../generated/rusefi_alphax-2chan.ini | 308 +++++++++--------- .../generated/rusefi_alphax-4chan.ini | 308 +++++++++--------- .../generated/rusefi_alphax-4chan_f7.ini | 308 +++++++++--------- .../generated/rusefi_alphax-4k-gdi.ini | 308 +++++++++--------- .../generated/rusefi_alphax-8chan-revA.ini | 308 +++++++++--------- .../generated/rusefi_alphax-8chan.ini | 308 +++++++++--------- .../generated/rusefi_alphax-8chan_f7.ini | 308 +++++++++--------- .../generated/rusefi_alphax-silver.ini | 308 +++++++++--------- .../generated/rusefi_at_start_f435.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_atlas.ini | 308 +++++++++--------- .../generated/rusefi_f407-discovery.ini | 308 +++++++++--------- .../generated/rusefi_f429-discovery.ini | 308 +++++++++--------- .../generated/rusefi_f469-discovery.ini | 308 +++++++++--------- .../generated/rusefi_frankenso_na6.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_haba208.ini | 308 +++++++++--------- .../generated/rusefi_hellen-112-17.ini | 308 +++++++++--------- .../generated/rusefi_hellen-gm-e67.ini | 308 +++++++++--------- .../generated/rusefi_hellen-honda-k.ini | 308 +++++++++--------- .../generated/rusefi_hellen-nb1.ini | 308 +++++++++--------- .../generated/rusefi_hellen121nissan.ini | 308 +++++++++--------- .../generated/rusefi_hellen121vag.ini | 308 +++++++++--------- .../generated/rusefi_hellen128.ini | 308 +++++++++--------- .../generated/rusefi_hellen154hyundai.ini | 308 +++++++++--------- .../generated/rusefi_hellen154hyundai_f7.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_hellen72.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_hellen81.ini | 308 +++++++++--------- .../generated/rusefi_hellen88bmw.ini | 308 +++++++++--------- .../generated/rusefi_hellenNA6.ini | 308 +++++++++--------- .../generated/rusefi_hellenNA8_96.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_m74_9.ini | 308 +++++++++--------- .../generated/rusefi_mre-legacy_f4.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f4.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_mre_f7.ini | 308 +++++++++--------- .../generated/rusefi_nucleo_f413.ini | 308 +++++++++--------- .../generated/rusefi_proteus_f4.ini | 308 +++++++++--------- .../generated/rusefi_proteus_f7.ini | 308 +++++++++--------- .../generated/rusefi_proteus_h7.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_s105.ini | 308 +++++++++--------- .../generated/rusefi_small-can-board.ini | 308 +++++++++--------- .../generated/rusefi_stm32f429_nucleo.ini | 308 +++++++++--------- .../generated/rusefi_stm32f767_nucleo.ini | 308 +++++++++--------- .../generated/rusefi_stm32h743_nucleo.ini | 308 +++++++++--------- .../generated/rusefi_subaru_eg33_f7.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_t-b-g.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_uaefi.ini | 308 +++++++++--------- .../tunerstudio/generated/rusefi_uaefi121.ini | 308 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 4 +- 145 files changed, 7707 insertions(+), 7707 deletions(-) diff --git a/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 7698dd348d..a693d97423 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -582,26 +582,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -688,51 +688,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -764,56 +764,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 56d9b23e10..d177a70b5c 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -25,16 +25,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" diff --git a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h index 9d2a106197..ce259c2cd5 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-2chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-2chan.h @@ -1336,7 +1336,7 @@ #define show_2chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 296671123 +#define SIGNATURE_HASH 385892301 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-2chan.296671123" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-2chan.385892301" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h index d7ae22cb51..7721259eb7 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan.h @@ -1337,7 +1337,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1479942170 +#define SIGNATURE_HASH 1587071044 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan.1479942170" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan.1587071044" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h index 36c5c7da56..dac51ba1c4 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4chan_f7.h @@ -1337,7 +1337,7 @@ #define show_4chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1479942170 +#define SIGNATURE_HASH 1587071044 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan_f7.1479942170" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan_f7.1587071044" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h index 842a1ad430..1c47264f02 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-4k-gdi.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 915468812 +#define SIGNATURE_HASH 809376338 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4k-gdi.915468812" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4k-gdi.809376338" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h index a0bc8abf4f..8a4c9b8904 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan-revA.h @@ -1336,7 +1336,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 659121079 +#define SIGNATURE_HASH 568822761 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan-revA.659121079" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan-revA.568822761" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h index 7ea780719f..ab6909e372 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan.h @@ -1334,7 +1334,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3341583513 +#define SIGNATURE_HASH 3246550215 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan.3341583513" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan.3246550215" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h index 1d0ca16e15..da44582ca0 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-8chan_f7.h @@ -1334,7 +1334,7 @@ #define show_8chan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3341583513 +#define SIGNATURE_HASH 3246550215 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1803,7 +1803,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan_f7.3341583513" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan_f7.3246550215" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_alphax-silver.h b/firmware/controllers/generated/rusefi_generated_alphax-silver.h index 10f8061825..4fa07bd8c8 100644 --- a/firmware/controllers/generated/rusefi_generated_alphax-silver.h +++ b/firmware/controllers/generated/rusefi_generated_alphax-silver.h @@ -1335,7 +1335,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 287772589 +#define SIGNATURE_HASH 394913779 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1804,7 +1804,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-silver.287772589" +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-silver.394913779" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_at_start_f435.h b/firmware/controllers/generated/rusefi_generated_at_start_f435.h index ecf9794964..5e684685bb 100644 --- a/firmware/controllers/generated/rusefi_generated_at_start_f435.h +++ b/firmware/controllers/generated/rusefi_generated_at_start_f435.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.at_start_f435.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.at_start_f435.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_atlas.h b/firmware/controllers/generated/rusefi_generated_atlas.h index a6ce017ead..7ef13620a5 100644 --- a/firmware/controllers/generated/rusefi_generated_atlas.h +++ b/firmware/controllers/generated/rusefi_generated_atlas.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2584500649 +#define SIGNATURE_HASH 2627908087 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.atlas.2584500649" +#define TS_SIGNATURE "rusEFI master.2025.01.17.atlas.2627908087" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f407-discovery.h b/firmware/controllers/generated/rusefi_generated_f407-discovery.h index cc46b47aaa..a5072fb40b 100644 --- a/firmware/controllers/generated/rusefi_generated_f407-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f407-discovery.h @@ -1339,7 +1339,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 1051935834 +#define SIGNATURE_HASH 941468676 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.f407-discovery.1051935834" +#define TS_SIGNATURE "rusEFI master.2025.01.17.f407-discovery.941468676" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f429-discovery.h b/firmware/controllers/generated/rusefi_generated_f429-discovery.h index 8ec4258685..feb1f68fb2 100644 --- a/firmware/controllers/generated/rusefi_generated_f429-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f429-discovery.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.f429-discovery.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.f429-discovery.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_f469-discovery.h b/firmware/controllers/generated/rusefi_generated_f469-discovery.h index 6e58e92d67..ac2bfe1f69 100644 --- a/firmware/controllers/generated/rusefi_generated_f469-discovery.h +++ b/firmware/controllers/generated/rusefi_generated_f469-discovery.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3973876596 +#define SIGNATURE_HASH 3933365034 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.f469-discovery.3973876596" +#define TS_SIGNATURE "rusEFI master.2025.01.17.f469-discovery.3933365034" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h index f4bdf06f66..57392c9aea 100644 --- a/firmware/controllers/generated/rusefi_generated_frankenso_na6.h +++ b/firmware/controllers/generated/rusefi_generated_frankenso_na6.h @@ -1340,7 +1340,7 @@ #define show_tcu_gauges false #define show_test_presets true #define show_vvt_output_pin true -#define SIGNATURE_HASH 2290678268 +#define SIGNATURE_HASH 2384859554 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1809,7 +1809,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.frankenso_na6.2290678268" +#define TS_SIGNATURE "rusEFI master.2025.01.17.frankenso_na6.2384859554" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_haba208.h b/firmware/controllers/generated/rusefi_generated_haba208.h index 56cbbfddfb..d0fc37a27a 100644 --- a/firmware/controllers/generated/rusefi_generated_haba208.h +++ b/firmware/controllers/generated/rusefi_generated_haba208.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.haba208.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.haba208.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h index 11530e9d3b..0eba666502 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-112-17.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-112-17.h @@ -1339,7 +1339,7 @@ #define show_8chan_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1459819875 +#define SIGNATURE_HASH 1370357053 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-112-17.1459819875" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-112-17.1370357053" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h index 6853f04e29..db6d92a852 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-gm-e67.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 309520991 +#define SIGNATURE_HASH 349962753 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-gm-e67.309520991" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-gm-e67.349962753" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h index 1a4bb02293..93d20b5c56 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-honda-k.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2318598033 +#define SIGNATURE_HASH 2359039951 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-honda-k.2318598033" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-honda-k.2359039951" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h index baac0dd477..f28235855b 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen-nb1.h +++ b/firmware/controllers/generated/rusefi_generated_hellen-nb1.h @@ -1339,7 +1339,7 @@ #define show_HellenNB1_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1571641592 +#define SIGNATURE_HASH 1526968486 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-nb1.1571641592" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-nb1.1526968486" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h index d0c168c12d..4f0e4e6a8d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121nissan.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121nissan.h @@ -1339,7 +1339,7 @@ #define show_Hellen121nissan_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 244326247 +#define SIGNATURE_HASH 138344249 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121nissan.244326247" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121nissan.138344249" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen121vag.h b/firmware/controllers/generated/rusefi_generated_hellen121vag.h index 7eb5923388..5d48caf30d 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen121vag.h +++ b/firmware/controllers/generated/rusefi_generated_hellen121vag.h @@ -1339,7 +1339,7 @@ #define show_Hellen121vag_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1459162400 +#define SIGNATURE_HASH 1347937662 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121vag.1459162400" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121vag.1347937662" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen128.h b/firmware/controllers/generated/rusefi_generated_hellen128.h index b80a14a9c9..e42e032200 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen128.h +++ b/firmware/controllers/generated/rusefi_generated_hellen128.h @@ -1339,7 +1339,7 @@ #define show_Hellen128merc_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 865707792 +#define SIGNATURE_HASH 892817230 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen128.865707792" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen128.892817230" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h index 22b6efd304..d2a63d3056 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1018580207 +#define SIGNATURE_HASH 974693553 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai.1018580207" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai.974693553" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h index f642f30c31..d4e46fa424 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/rusefi_generated_hellen154hyundai_f7.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3488205437 +#define SIGNATURE_HASH 3376882211 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai_f7.3488205437" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai_f7.3376882211" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen72.h b/firmware/controllers/generated/rusefi_generated_hellen72.h index c83d8d96b7..265218a16a 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen72.h +++ b/firmware/controllers/generated/rusefi_generated_hellen72.h @@ -1339,7 +1339,7 @@ #define show_HellenNB2_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 589520945 +#define SIGNATURE_HASH 630032495 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen72.589520945" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen72.630032495" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen81.h b/firmware/controllers/generated/rusefi_generated_hellen81.h index 63a5bf8e6c..e16e012dbd 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen81.h +++ b/firmware/controllers/generated/rusefi_generated_hellen81.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3147504897 +#define SIGNATURE_HASH 3174430047 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen81.3147504897" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen81.3174430047" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h index 92dcc1517c..35c6bee8d8 100644 --- a/firmware/controllers/generated/rusefi_generated_hellen88bmw.h +++ b/firmware/controllers/generated/rusefi_generated_hellen88bmw.h @@ -1339,7 +1339,7 @@ #define show_Hellen88bmw_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2897741890 +#define SIGNATURE_HASH 2853625884 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen88bmw.2897741890" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen88bmw.2853625884" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA6.h b/firmware/controllers/generated/rusefi_generated_hellenNA6.h index d27a1697fc..8f2e77538c 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA6.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA6.h @@ -1339,7 +1339,7 @@ #define show_HellenNA6_presets true #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1252945415 +#define SIGNATURE_HASH 1275102809 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA6.1252945415" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA6.1275102809" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h index 36ec8fad6d..1e44a38bb1 100644 --- a/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h +++ b/firmware/controllers/generated/rusefi_generated_hellenNA8_96.h @@ -1340,7 +1340,7 @@ #define show_HellenNB1_presets false #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3044289737 +#define SIGNATURE_HASH 3017458839 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1809,7 +1809,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA8_96.3044289737" +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA8_96.3017458839" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_m74_9.h b/firmware/controllers/generated/rusefi_generated_m74_9.h index 04e3cbea5d..dd1b0fcc48 100644 --- a/firmware/controllers/generated/rusefi_generated_m74_9.h +++ b/firmware/controllers/generated/rusefi_generated_m74_9.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3088633464 +#define SIGNATURE_HASH 3199608358 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.m74_9.3088633464" +#define TS_SIGNATURE "rusEFI master.2025.01.17.m74_9.3199608358" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h index 8a0516cb62..8b1eaaaf2c 100644 --- a/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre-legacy_f4.h @@ -1337,7 +1337,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2507492388 +#define SIGNATURE_HASH 2480645242 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre-legacy_f4.2507492388" +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre-legacy_f4.2480645242" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f4.h b/firmware/controllers/generated/rusefi_generated_mre_f4.h index ad5370f1de..af444a2f5e 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f4.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f4.h @@ -1337,7 +1337,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2507492388 +#define SIGNATURE_HASH 2480645242 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f4.2507492388" +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f4.2480645242" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_mre_f7.h b/firmware/controllers/generated/rusefi_generated_mre_f7.h index 16a009c10a..6a13760105 100644 --- a/firmware/controllers/generated/rusefi_generated_mre_f7.h +++ b/firmware/controllers/generated/rusefi_generated_mre_f7.h @@ -1337,7 +1337,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2507492388 +#define SIGNATURE_HASH 2480645242 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f7.2507492388" +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f7.2480645242" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h index fb6cf88c8d..b0b0e7bb77 100644 --- a/firmware/controllers/generated/rusefi_generated_nucleo_f413.h +++ b/firmware/controllers/generated/rusefi_generated_nucleo_f413.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.nucleo_f413.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.nucleo_f413.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f4.h b/firmware/controllers/generated/rusefi_generated_proteus_f4.h index a9d04daf84..621a4e769a 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f4.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f4.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3018579111 +#define SIGNATURE_HASH 3041211641 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f4.3018579111" +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f4.3041211641" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_f7.h b/firmware/controllers/generated/rusefi_generated_proteus_f7.h index e97e630b7f..d4d31bb366 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_f7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_f7.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3018579111 +#define SIGNATURE_HASH 3041211641 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f7.3018579111" +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f7.3041211641" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_proteus_h7.h b/firmware/controllers/generated/rusefi_generated_proteus_h7.h index b43db4da58..572b19a7fb 100644 --- a/firmware/controllers/generated/rusefi_generated_proteus_h7.h +++ b/firmware/controllers/generated/rusefi_generated_proteus_h7.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3018579111 +#define SIGNATURE_HASH 3041211641 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_h7.3018579111" +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_h7.3041211641" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_s105.h b/firmware/controllers/generated/rusefi_generated_s105.h index 9f52c5f8ec..fa45cc947f 100644 --- a/firmware/controllers/generated/rusefi_generated_s105.h +++ b/firmware/controllers/generated/rusefi_generated_s105.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 1635781925 +#define SIGNATURE_HASH 1731126651 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.s105.1635781925" +#define TS_SIGNATURE "rusEFI master.2025.01.17.s105.1731126651" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_small-can-board.h b/firmware/controllers/generated/rusefi_generated_small-can-board.h index da1b9687fd..080c66823a 100644 --- a/firmware/controllers/generated/rusefi_generated_small-can-board.h +++ b/firmware/controllers/generated/rusefi_generated_small-can-board.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2196807882 +#define SIGNATURE_HASH 2220771476 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1806,7 +1806,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.small-can-board.2196807882" +#define TS_SIGNATURE "rusEFI master.2025.01.17.small-can-board.2220771476" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h index 3c66458396..a022353a7b 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f429_nucleo.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f429_nucleo.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f429_nucleo.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h index f93713f787..cc51fe699e 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32f767_nucleo.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f767_nucleo.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f767_nucleo.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h index aa3bd0c416..b3e610419d 100644 --- a/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h +++ b/firmware/controllers/generated/rusefi_generated_stm32h743_nucleo.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32h743_nucleo.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32h743_nucleo.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h index 0c8e10cc2b..5d43ad3272 100644 --- a/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h +++ b/firmware/controllers/generated/rusefi_generated_subaru_eg33_f7.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2167059897 +#define SIGNATURE_HASH 2273598951 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1808,7 +1808,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.subaru_eg33_f7.2167059897" +#define TS_SIGNATURE "rusEFI master.2025.01.17.subaru_eg33_f7.2273598951" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_t-b-g.h b/firmware/controllers/generated/rusefi_generated_t-b-g.h index a839e02c53..9a9cdd325c 100644 --- a/firmware/controllers/generated/rusefi_generated_t-b-g.h +++ b/firmware/controllers/generated/rusefi_generated_t-b-g.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3725299175 +#define SIGNATURE_HASH 3634718137 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.t-b-g.3725299175" +#define TS_SIGNATURE "rusEFI master.2025.01.17.t-b-g.3634718137" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h index aa71fab332..290b08751d 100644 --- a/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h +++ b/firmware/controllers/generated/rusefi_generated_tdg-pdm8.h @@ -1338,7 +1338,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3827708271 +#define SIGNATURE_HASH 3800619313 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1807,7 +1807,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.tdg-pdm8.3827708271" +#define TS_SIGNATURE "rusEFI master.2025.01.17.tdg-pdm8.3800619313" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi.h b/firmware/controllers/generated/rusefi_generated_uaefi.h index 12b30429e8..e08dcd950c 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi.h @@ -1332,7 +1332,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 3729916916 +#define SIGNATURE_HASH 3640454058 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1802,7 +1802,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi.3729916916" +#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi.3640454058" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/rusefi_generated_uaefi121.h b/firmware/controllers/generated/rusefi_generated_uaefi121.h index a666971ed6..1d8202db5b 100644 --- a/firmware/controllers/generated/rusefi_generated_uaefi121.h +++ b/firmware/controllers/generated/rusefi_generated_uaefi121.h @@ -1336,7 +1336,7 @@ #define SentInput_NONE 0 #define show_tcu_gauges false #define show_vvt_output_pin true -#define SIGNATURE_HASH 4109352281 +#define SIGNATURE_HASH 4064367879 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1805,7 +1805,7 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi121.4109352281" +#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi121.4064367879" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d93036aaa3..b5a9d0f2f7 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 296671123 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-2chan.296671123" +#define SIGNATURE_HASH 385892301 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-2chan.385892301" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index d68fcafa12..862ab16423 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1479942170 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan.1479942170" +#define SIGNATURE_HASH 1587071044 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan.1587071044" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 38a230644f..1a3edcee3b 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1479942170 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan_f7.1479942170" +#define SIGNATURE_HASH 1587071044 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4chan_f7.1587071044" diff --git a/firmware/controllers/generated/signature_alphax-4k-gdi.h b/firmware/controllers/generated/signature_alphax-4k-gdi.h index a369519bb4..58d5286754 100644 --- a/firmware/controllers/generated/signature_alphax-4k-gdi.h +++ b/firmware/controllers/generated/signature_alphax-4k-gdi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 915468812 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4k-gdi.915468812" +#define SIGNATURE_HASH 809376338 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-4k-gdi.809376338" diff --git a/firmware/controllers/generated/signature_alphax-8chan-revA.h b/firmware/controllers/generated/signature_alphax-8chan-revA.h index a90eb85dfa..e04516fd50 100644 --- a/firmware/controllers/generated/signature_alphax-8chan-revA.h +++ b/firmware/controllers/generated/signature_alphax-8chan-revA.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 659121079 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan-revA.659121079" +#define SIGNATURE_HASH 568822761 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan-revA.568822761" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 8733710728..72d857035d 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3341583513 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan.3341583513" +#define SIGNATURE_HASH 3246550215 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan.3246550215" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index ddd3ca0ea4..9839ba299d 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3341583513 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan_f7.3341583513" +#define SIGNATURE_HASH 3246550215 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-8chan_f7.3246550215" diff --git a/firmware/controllers/generated/signature_alphax-silver.h b/firmware/controllers/generated/signature_alphax-silver.h index 928de530ff..9231639edd 100644 --- a/firmware/controllers/generated/signature_alphax-silver.h +++ b/firmware/controllers/generated/signature_alphax-silver.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 287772589 -#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-silver.287772589" +#define SIGNATURE_HASH 394913779 +#define TS_SIGNATURE "rusEFI master.2025.01.17.alphax-silver.394913779" diff --git a/firmware/controllers/generated/signature_at_start_f435.h b/firmware/controllers/generated/signature_at_start_f435.h index b70a974541..69a6ffbfa9 100644 --- a/firmware/controllers/generated/signature_at_start_f435.h +++ b/firmware/controllers/generated/signature_at_start_f435.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.at_start_f435.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.at_start_f435.3634718137" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 7e6c73c1c4..b3c43b2e0b 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2584500649 -#define TS_SIGNATURE "rusEFI master.2025.01.17.atlas.2584500649" +#define SIGNATURE_HASH 2627908087 +#define TS_SIGNATURE "rusEFI master.2025.01.17.atlas.2627908087" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index c1c4851811..d87b26f882 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1051935834 -#define TS_SIGNATURE "rusEFI master.2025.01.17.f407-discovery.1051935834" +#define SIGNATURE_HASH 941468676 +#define TS_SIGNATURE "rusEFI master.2025.01.17.f407-discovery.941468676" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index ca4efc9b79..d3c7512b52 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.f429-discovery.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.f429-discovery.3634718137" diff --git a/firmware/controllers/generated/signature_f469-discovery.h b/firmware/controllers/generated/signature_f469-discovery.h index c399a3ff9c..37a6eaea75 100644 --- a/firmware/controllers/generated/signature_f469-discovery.h +++ b/firmware/controllers/generated/signature_f469-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3973876596 -#define TS_SIGNATURE "rusEFI master.2025.01.17.f469-discovery.3973876596" +#define SIGNATURE_HASH 3933365034 +#define TS_SIGNATURE "rusEFI master.2025.01.17.f469-discovery.3933365034" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index fd221c0d75..162eba4c94 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2290678268 -#define TS_SIGNATURE "rusEFI master.2025.01.17.frankenso_na6.2290678268" +#define SIGNATURE_HASH 2384859554 +#define TS_SIGNATURE "rusEFI master.2025.01.17.frankenso_na6.2384859554" diff --git a/firmware/controllers/generated/signature_haba208.h b/firmware/controllers/generated/signature_haba208.h index 016304638e..13a24ff043 100644 --- a/firmware/controllers/generated/signature_haba208.h +++ b/firmware/controllers/generated/signature_haba208.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.haba208.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.haba208.3634718137" diff --git a/firmware/controllers/generated/signature_hellen-112-17.h b/firmware/controllers/generated/signature_hellen-112-17.h index 6aa5cdc8ac..0ed5e2ba27 100644 --- a/firmware/controllers/generated/signature_hellen-112-17.h +++ b/firmware/controllers/generated/signature_hellen-112-17.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1459819875 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-112-17.1459819875" +#define SIGNATURE_HASH 1370357053 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-112-17.1370357053" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 0170e3af0d..532f4780ca 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 309520991 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-gm-e67.309520991" +#define SIGNATURE_HASH 349962753 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-gm-e67.349962753" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index 1cd5774e49..1963b7f91a 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2318598033 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-honda-k.2318598033" +#define SIGNATURE_HASH 2359039951 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-honda-k.2359039951" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 6e34c6f00c..cf2a9713d9 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1571641592 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-nb1.1571641592" +#define SIGNATURE_HASH 1526968486 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen-nb1.1526968486" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 4baa73c901..c82bc3babb 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 244326247 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121nissan.244326247" +#define SIGNATURE_HASH 138344249 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121nissan.138344249" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index a11414dda9..766cc44846 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1459162400 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121vag.1459162400" +#define SIGNATURE_HASH 1347937662 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen121vag.1347937662" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 8191d80214..9993c3cacc 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 865707792 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen128.865707792" +#define SIGNATURE_HASH 892817230 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen128.892817230" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index ee995928a0..88faa449c6 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1018580207 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai.1018580207" +#define SIGNATURE_HASH 974693553 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai.974693553" diff --git a/firmware/controllers/generated/signature_hellen154hyundai_f7.h b/firmware/controllers/generated/signature_hellen154hyundai_f7.h index 7a4658b525..251530d998 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai_f7.h +++ b/firmware/controllers/generated/signature_hellen154hyundai_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3488205437 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai_f7.3488205437" +#define SIGNATURE_HASH 3376882211 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen154hyundai_f7.3376882211" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 7f3cdcfdc5..b9a1cd3aab 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 589520945 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen72.589520945" +#define SIGNATURE_HASH 630032495 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen72.630032495" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 30cbad1f91..9b0fb882e6 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3147504897 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen81.3147504897" +#define SIGNATURE_HASH 3174430047 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen81.3174430047" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 6a70465af8..25bae4ebe9 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2897741890 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen88bmw.2897741890" +#define SIGNATURE_HASH 2853625884 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellen88bmw.2853625884" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 2876439353..5e0997d4f2 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1252945415 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA6.1252945415" +#define SIGNATURE_HASH 1275102809 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA6.1275102809" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index caab2b765d..f4b3db5726 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3044289737 -#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA8_96.3044289737" +#define SIGNATURE_HASH 3017458839 +#define TS_SIGNATURE "rusEFI master.2025.01.17.hellenNA8_96.3017458839" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index 52cf9f5d5c..15c6821301 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3088633464 -#define TS_SIGNATURE "rusEFI master.2025.01.17.m74_9.3088633464" +#define SIGNATURE_HASH 3199608358 +#define TS_SIGNATURE "rusEFI master.2025.01.17.m74_9.3199608358" diff --git a/firmware/controllers/generated/signature_mre-legacy_f4.h b/firmware/controllers/generated/signature_mre-legacy_f4.h index fba88d3efa..426ff58d2e 100644 --- a/firmware/controllers/generated/signature_mre-legacy_f4.h +++ b/firmware/controllers/generated/signature_mre-legacy_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2507492388 -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre-legacy_f4.2507492388" +#define SIGNATURE_HASH 2480645242 +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre-legacy_f4.2480645242" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index ba8d91c96b..65a1779ab9 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2507492388 -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f4.2507492388" +#define SIGNATURE_HASH 2480645242 +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f4.2480645242" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index a6c11be8b1..4b11f9a030 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2507492388 -#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f7.2507492388" +#define SIGNATURE_HASH 2480645242 +#define TS_SIGNATURE "rusEFI master.2025.01.17.mre_f7.2480645242" diff --git a/firmware/controllers/generated/signature_nucleo_f413.h b/firmware/controllers/generated/signature_nucleo_f413.h index 9f98a3d351..2743033fd3 100644 --- a/firmware/controllers/generated/signature_nucleo_f413.h +++ b/firmware/controllers/generated/signature_nucleo_f413.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.nucleo_f413.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.nucleo_f413.3634718137" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index f8947a2c89..64666a471b 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3018579111 -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f4.3018579111" +#define SIGNATURE_HASH 3041211641 +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f4.3041211641" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 89a56066ac..164ed79c33 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3018579111 -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f7.3018579111" +#define SIGNATURE_HASH 3041211641 +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_f7.3041211641" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index ab7b766266..2c3f4db0cf 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3018579111 -#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_h7.3018579111" +#define SIGNATURE_HASH 3041211641 +#define TS_SIGNATURE "rusEFI master.2025.01.17.proteus_h7.3041211641" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 5daab93c5c..7b64c925e9 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1635781925 -#define TS_SIGNATURE "rusEFI master.2025.01.17.s105.1635781925" +#define SIGNATURE_HASH 1731126651 +#define TS_SIGNATURE "rusEFI master.2025.01.17.s105.1731126651" diff --git a/firmware/controllers/generated/signature_small-can-board.h b/firmware/controllers/generated/signature_small-can-board.h index a7a5ef469c..083203fa24 100644 --- a/firmware/controllers/generated/signature_small-can-board.h +++ b/firmware/controllers/generated/signature_small-can-board.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2196807882 -#define TS_SIGNATURE "rusEFI master.2025.01.17.small-can-board.2196807882" +#define SIGNATURE_HASH 2220771476 +#define TS_SIGNATURE "rusEFI master.2025.01.17.small-can-board.2220771476" diff --git a/firmware/controllers/generated/signature_stm32f429_nucleo.h b/firmware/controllers/generated/signature_stm32f429_nucleo.h index 9050d80c93..7d8f7dfd10 100644 --- a/firmware/controllers/generated/signature_stm32f429_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f429_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f429_nucleo.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f429_nucleo.3634718137" diff --git a/firmware/controllers/generated/signature_stm32f767_nucleo.h b/firmware/controllers/generated/signature_stm32f767_nucleo.h index b658d02bca..0b3a7a7847 100644 --- a/firmware/controllers/generated/signature_stm32f767_nucleo.h +++ b/firmware/controllers/generated/signature_stm32f767_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f767_nucleo.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32f767_nucleo.3634718137" diff --git a/firmware/controllers/generated/signature_stm32h743_nucleo.h b/firmware/controllers/generated/signature_stm32h743_nucleo.h index d1aa871d64..890f7e0b4d 100644 --- a/firmware/controllers/generated/signature_stm32h743_nucleo.h +++ b/firmware/controllers/generated/signature_stm32h743_nucleo.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32h743_nucleo.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.stm32h743_nucleo.3634718137" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 4ff039b7cf..ad232d0c82 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2167059897 -#define TS_SIGNATURE "rusEFI master.2025.01.17.subaru_eg33_f7.2167059897" +#define SIGNATURE_HASH 2273598951 +#define TS_SIGNATURE "rusEFI master.2025.01.17.subaru_eg33_f7.2273598951" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index 6cc7dd46c5..8163508175 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3725299175 -#define TS_SIGNATURE "rusEFI master.2025.01.17.t-b-g.3725299175" +#define SIGNATURE_HASH 3634718137 +#define TS_SIGNATURE "rusEFI master.2025.01.17.t-b-g.3634718137" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 601b21e1fd..12e58c9cb4 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3827708271 -#define TS_SIGNATURE "rusEFI master.2025.01.17.tdg-pdm8.3827708271" +#define SIGNATURE_HASH 3800619313 +#define TS_SIGNATURE "rusEFI master.2025.01.17.tdg-pdm8.3800619313" diff --git a/firmware/controllers/generated/signature_uaefi.h b/firmware/controllers/generated/signature_uaefi.h index 6ce28fdaff..b98035b19d 100644 --- a/firmware/controllers/generated/signature_uaefi.h +++ b/firmware/controllers/generated/signature_uaefi.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3729916916 -#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi.3729916916" +#define SIGNATURE_HASH 3640454058 +#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi.3640454058" diff --git a/firmware/controllers/generated/signature_uaefi121.h b/firmware/controllers/generated/signature_uaefi121.h index 2e00356d84..52ca59ae74 100644 --- a/firmware/controllers/generated/signature_uaefi121.h +++ b/firmware/controllers/generated/signature_uaefi121.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 4109352281 -#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi121.4109352281" +#define SIGNATURE_HASH 4064367879 +#define TS_SIGNATURE "rusEFI master.2025.01.17.uaefi121.4064367879" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index a4276e4859..7771d4a034 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.f407-discovery.1051935834" + signature = "rusEFI master.2025.01.17.f407-discovery.941468676" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.f407-discovery.1051935834" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.f407-discovery.941468676" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3591,7 +3591,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3634,7 +3634,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4875,16 +4875,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5282,12 +5282,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5316,9 +5316,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black indicator = {injectorHwIssue}, "inj", "INJ", white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black @@ -5923,26 +5923,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6029,51 +6029,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6105,56 +6105,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8569,30 +8569,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index fa8c7fa9ed..5ce1f8a057 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-2chan.296671123" + signature = "rusEFI master.2025.01.17.alphax-2chan.385892301" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-2chan.296671123" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-2chan.385892301" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3595,7 +3595,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3638,7 +3638,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4879,16 +4879,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5280,12 +5280,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5313,9 +5313,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5919,26 +5919,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6025,51 +6025,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6101,56 +6101,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8488,30 +8488,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 50ed0fbf03..f32c2fa679 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-4chan.1479942170" + signature = "rusEFI master.2025.01.17.alphax-4chan.1587071044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-4chan.1479942170" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-4chan.1587071044" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3600,7 +3600,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3643,7 +3643,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4884,16 +4884,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5291,12 +5291,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5325,9 +5325,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5932,26 +5932,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6038,51 +6038,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6114,56 +6114,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8555,30 +8555,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index c5aeade723..0e2affcef1 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-4chan_f7.1479942170" + signature = "rusEFI master.2025.01.17.alphax-4chan_f7.1587071044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-4chan_f7.1479942170" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-4chan_f7.1587071044" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3600,7 +3600,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3643,7 +3643,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4884,16 +4884,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5291,12 +5291,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5325,9 +5325,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5932,26 +5932,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6038,51 +6038,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6114,56 +6114,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8555,30 +8555,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini index 479ff605fa..7561ac0b9b 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4k-gdi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-4k-gdi.915468812" + signature = "rusEFI master.2025.01.17.alphax-4k-gdi.809376338" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-4k-gdi.915468812" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-4k-gdi.809376338" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4871,16 +4871,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5278,12 +5278,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5312,9 +5312,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5918,26 +5918,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6024,51 +6024,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6100,56 +6100,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8525,30 +8525,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini index 68ba21cc5a..e4e3f9c811 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan-revA.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-8chan-revA.659121079" + signature = "rusEFI master.2025.01.17.alphax-8chan-revA.568822761" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-8chan-revA.659121079" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-8chan-revA.568822761" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3595,7 +3595,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3638,7 +3638,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4879,16 +4879,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5286,12 +5286,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5320,9 +5320,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5926,26 +5926,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6032,51 +6032,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6108,56 +6108,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8531,30 +8531,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index c3d1a7db84..24b5d8e664 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-8chan.3341583513" + signature = "rusEFI master.2025.01.17.alphax-8chan.3246550215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-8chan.3341583513" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-8chan.3246550215" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3604,7 +3604,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3647,7 +3647,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4888,16 +4888,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5295,12 +5295,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5329,9 +5329,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5936,26 +5936,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6042,51 +6042,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6118,56 +6118,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8555,30 +8555,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index 19b3c40dcd..094ed15623 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-8chan_f7.3341583513" + signature = "rusEFI master.2025.01.17.alphax-8chan_f7.3246550215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-8chan_f7.3341583513" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-8chan_f7.3246550215" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3604,7 +3604,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3647,7 +3647,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4888,16 +4888,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5295,12 +5295,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5329,9 +5329,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5936,26 +5936,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6042,51 +6042,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6118,56 +6118,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8555,30 +8555,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini index 148140bc5f..168600329e 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-silver.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-silver.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.alphax-silver.287772589" + signature = "rusEFI master.2025.01.17.alphax-silver.394913779" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.alphax-silver.287772589" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.alphax-silver.394913779" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3591,7 +3591,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3634,7 +3634,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4875,16 +4875,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5276,12 +5276,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5309,9 +5309,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5915,26 +5915,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6021,51 +6021,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6097,56 +6097,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8482,30 +8482,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini index 91a9d64909..0233bf2679 100644 --- a/firmware/tunerstudio/generated/rusefi_at_start_f435.ini +++ b/firmware/tunerstudio/generated/rusefi_at_start_f435.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.at_start_f435.3725299175" + signature = "rusEFI master.2025.01.17.at_start_f435.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.at_start_f435.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.at_start_f435.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index b5e6d0ed35..c95492e65b 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.atlas.2584500649" + signature = "rusEFI master.2025.01.17.atlas.2627908087" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.atlas.2584500649" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.atlas.2627908087" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8552,30 +8552,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index a4276e4859..7771d4a034 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.f407-discovery.1051935834" + signature = "rusEFI master.2025.01.17.f407-discovery.941468676" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.f407-discovery.1051935834" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.f407-discovery.941468676" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3591,7 +3591,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3634,7 +3634,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4875,16 +4875,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5282,12 +5282,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5316,9 +5316,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black indicator = {injectorHwIssue}, "inj", "INJ", white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black @@ -5923,26 +5923,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6029,51 +6029,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6105,56 +6105,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8569,30 +8569,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index a88da9ea48..efd940bcd6 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.f429-discovery.3725299175" + signature = "rusEFI master.2025.01.17.f429-discovery.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.f429-discovery.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.f429-discovery.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini index 1e4239b3f0..8dda567b12 100644 --- a/firmware/tunerstudio/generated/rusefi_f469-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f469-discovery.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.f469-discovery.3973876596" + signature = "rusEFI master.2025.01.17.f469-discovery.3933365034" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.f469-discovery.3973876596" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.f469-discovery.3933365034" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 7eb951ad08..670d16ff61 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.frankenso_na6.2290678268" + signature = "rusEFI master.2025.01.17.frankenso_na6.2384859554" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.frankenso_na6.2290678268" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.frankenso_na6.2384859554" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_haba208.ini b/firmware/tunerstudio/generated/rusefi_haba208.ini index 64a5ed2e3b..2672b30b5b 100644 --- a/firmware/tunerstudio/generated/rusefi_haba208.ini +++ b/firmware/tunerstudio/generated/rusefi_haba208.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.haba208.3725299175" + signature = "rusEFI master.2025.01.17.haba208.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.haba208.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.haba208.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini index 3b8a26332f..16afbb1d7e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-112-17.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen-112-17.1459819875" + signature = "rusEFI master.2025.01.17.hellen-112-17.1370357053" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen-112-17.1459819875" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen-112-17.1370357053" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8524,30 +8524,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 3487cc572e..de0190f69c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen-gm-e67.309520991" + signature = "rusEFI master.2025.01.17.hellen-gm-e67.349962753" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen-gm-e67.309520991" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen-gm-e67.349962753" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 3b85d65107..bcb57dd3df 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -4,12 +4,12 @@ enable2ndByteCanID = false [SettingGroups] [MegaTune] - signature = "rusEFI master.2025.01.17.hellen-honda-k.2318598033" + signature = "rusEFI master.2025.01.17.hellen-honda-k.2359039951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen-honda-k.2318598033" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen-honda-k.2359039951" ; signature is expected to be 7 or more characters. useLegacyFTempUnits = false ignoreMissingBitOptions = true @@ -3523,7 +3523,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3560,7 +3560,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 injModeList = bits, U08, [0:3], "Simultaneous", "Sequential", "Batch", "Single Point" ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4778,16 +4778,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5155,11 +5155,11 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black indicator = { clutchUpState }, "No clutch Up", "Clutch Up", white, black, red, black indicator = { clutchDownState }, "No clutch down", "Clutch down", white, black, yellow, black @@ -5179,9 +5179,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_present }, "No SD card", "SD card present", white, black, green, black indicator = { sd_logging_internal }, "No SD logging", "SD logging", white, black, green, black indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black @@ -5777,26 +5777,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -5883,51 +5883,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -5959,56 +5959,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8284,30 +8284,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index b17d19cefc..7e201233eb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen-nb1.1571641592" + signature = "rusEFI master.2025.01.17.hellen-nb1.1526968486" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen-nb1.1571641592" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen-nb1.1526968486" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 58213d2a48..56a73b4139 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen121nissan.244326247" + signature = "rusEFI master.2025.01.17.hellen121nissan.138344249" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen121nissan.244326247" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen121nissan.138344249" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8515,30 +8515,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index b4a77e3746..83025abbb4 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen121vag.1459162400" + signature = "rusEFI master.2025.01.17.hellen121vag.1347937662" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen121vag.1459162400" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen121vag.1347937662" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8543,30 +8543,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen128.ini b/firmware/tunerstudio/generated/rusefi_hellen128.ini index c0a9a110c6..947a6560d0 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen128.865707792" + signature = "rusEFI master.2025.01.17.hellen128.892817230" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen128.865707792" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen128.892817230" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8550,30 +8550,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 9ea9e086c6..ba3c2a2693 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen154hyundai.1018580207" + signature = "rusEFI master.2025.01.17.hellen154hyundai.974693553" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen154hyundai.1018580207" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen154hyundai.974693553" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5277,12 +5277,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5311,9 +5311,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5917,26 +5917,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6023,51 +6023,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6099,56 +6099,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8480,30 +8480,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini index e5c6e48ca4..fcd5b78d3f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen154hyundai_f7.3488205437" + signature = "rusEFI master.2025.01.17.hellen154hyundai_f7.3376882211" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen154hyundai_f7.3488205437" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen154hyundai_f7.3376882211" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5277,12 +5277,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5311,9 +5311,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5917,26 +5917,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6023,51 +6023,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6099,56 +6099,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8481,30 +8481,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index e4a3b7d599..59ca5ea266 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen72.589520945" + signature = "rusEFI master.2025.01.17.hellen72.630032495" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen72.589520945" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen72.630032495" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index e36ce7b20f..0b2ad31901 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen81.3147504897" + signature = "rusEFI master.2025.01.17.hellen81.3174430047" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen81.3147504897" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen81.3174430047" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8549,30 +8549,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 72a6171569..1c7e54a836 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellen88bmw.2897741890" + signature = "rusEFI master.2025.01.17.hellen88bmw.2853625884" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellen88bmw.2897741890" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellen88bmw.2853625884" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8547,30 +8547,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 11acab615b..71150b41d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellenNA6.1252945415" + signature = "rusEFI master.2025.01.17.hellenNA6.1275102809" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellenNA6.1252945415" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellenNA6.1275102809" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 6d927896b7..800dd984c3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.hellenNA8_96.3044289737" + signature = "rusEFI master.2025.01.17.hellenNA8_96.3017458839" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.hellenNA8_96.3044289737" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.hellenNA8_96.3017458839" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 836e95ebba..0183e4538b 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.m74_9.3088633464" + signature = "rusEFI master.2025.01.17.m74_9.3199608358" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.m74_9.3088633464" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.m74_9.3199608358" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8553,30 +8553,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini index 29ba518a50..41cfd458c4 100644 --- a/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre-legacy_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.mre-legacy_f4.2507492388" + signature = "rusEFI master.2025.01.17.mre-legacy_f4.2480645242" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.mre-legacy_f4.2507492388" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.mre-legacy_f4.2480645242" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5277,12 +5277,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5311,9 +5311,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black indicator = {injectorHwIssue}, "inj", "INJ", white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black @@ -5919,26 +5919,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6025,51 +6025,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6101,56 +6101,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8548,30 +8548,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 1199e7527e..729ac9c7f7 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.mre_f4.2507492388" + signature = "rusEFI master.2025.01.17.mre_f4.2480645242" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.mre_f4.2507492388" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.mre_f4.2480645242" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5277,12 +5277,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5311,9 +5311,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black indicator = {injectorHwIssue}, "inj", "INJ", white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black @@ -5919,26 +5919,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6025,51 +6025,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6101,56 +6101,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8548,30 +8548,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 090cfaa587..4e40b66638 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.mre_f7.2507492388" + signature = "rusEFI master.2025.01.17.mre_f7.2480645242" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.mre_f7.2507492388" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.mre_f7.2480645242" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5277,12 +5277,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5311,9 +5311,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black indicator = {injectorHwIssue}, "inj", "INJ", white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black @@ -5919,26 +5919,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6025,51 +6025,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6101,56 +6101,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8548,30 +8548,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini index b8ae338753..469dbdc13c 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f413.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.nucleo_f413.3725299175" + signature = "rusEFI master.2025.01.17.nucleo_f413.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.nucleo_f413.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.nucleo_f413.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 3b0b53e9d6..068bd58fcb 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.proteus_f4.3018579111" + signature = "rusEFI master.2025.01.17.proteus_f4.3041211641" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.proteus_f4.3018579111" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.proteus_f4.3041211641" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5922,26 +5922,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6028,51 +6028,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6104,56 +6104,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8584,30 +8584,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index a1aceaab20..8cf1b24c01 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.proteus_f7.3018579111" + signature = "rusEFI master.2025.01.17.proteus_f7.3041211641" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.proteus_f7.3018579111" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.proteus_f7.3041211641" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5922,26 +5922,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6028,51 +6028,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6104,56 +6104,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8584,30 +8584,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 040731b018..40c534cf08 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.proteus_h7.3018579111" + signature = "rusEFI master.2025.01.17.proteus_h7.3041211641" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.proteus_h7.3018579111" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.proteus_h7.3041211641" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5922,26 +5922,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6028,51 +6028,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6104,56 +6104,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8584,30 +8584,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 4d99a3280c..b396f43462 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.s105.1635781925" + signature = "rusEFI master.2025.01.17.s105.1731126651" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.s105.1635781925" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.s105.1731126651" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8551,30 +8551,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_small-can-board.ini b/firmware/tunerstudio/generated/rusefi_small-can-board.ini index 891155ee33..629819c9a7 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can-board.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can-board.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.small-can-board.2196807882" + signature = "rusEFI master.2025.01.17.small-can-board.2220771476" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.small-can-board.2196807882" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.small-can-board.2220771476" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8552,30 +8552,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini index c165b8ecc0..8eb2399058 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f429_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.stm32f429_nucleo.3725299175" + signature = "rusEFI master.2025.01.17.stm32f429_nucleo.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.stm32f429_nucleo.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.stm32f429_nucleo.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini index 6834021acf..c16b8e6d89 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32f767_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.stm32f767_nucleo.3725299175" + signature = "rusEFI master.2025.01.17.stm32f767_nucleo.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.stm32f767_nucleo.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.stm32f767_nucleo.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini index f731df0274..75551bf9f2 100644 --- a/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini +++ b/firmware/tunerstudio/generated/rusefi_stm32h743_nucleo.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.stm32h743_nucleo.3725299175" + signature = "rusEFI master.2025.01.17.stm32h743_nucleo.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.stm32h743_nucleo.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.stm32h743_nucleo.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 9b1f8a32aa..e1c6bd7490 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.subaru_eg33_f7.2167059897" + signature = "rusEFI master.2025.01.17.subaru_eg33_f7.2273598951" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.subaru_eg33_f7.2167059897" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.subaru_eg33_f7.2273598951" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8562,30 +8562,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 6bf39e3f5c..c4cdb9d6c9 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.t-b-g.3725299175" + signature = "rusEFI master.2025.01.17.t-b-g.3634718137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.t-b-g.3725299175" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.t-b-g.3634718137" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 0896594b29..196effd1dc 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.tdg-pdm8.3827708271" + signature = "rusEFI master.2025.01.17.tdg-pdm8.3800619313" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.tdg-pdm8.3827708271" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.tdg-pdm8.3800619313" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5921,26 +5921,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6027,51 +6027,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6103,56 +6103,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8560,30 +8560,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_uaefi.ini b/firmware/tunerstudio/generated/rusefi_uaefi.ini index b258eeddfb..db6f9c1784 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.uaefi.3729916916" + signature = "rusEFI master.2025.01.17.uaefi.3640454058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.uaefi.3729916916" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.uaefi.3640454058" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3593,7 +3593,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3636,7 +3636,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4884,16 +4884,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5291,12 +5291,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5325,9 +5325,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5932,26 +5932,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6038,51 +6038,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6114,56 +6114,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8569,30 +8569,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/firmware/tunerstudio/generated/rusefi_uaefi121.ini b/firmware/tunerstudio/generated/rusefi_uaefi121.ini index ad4567b70d..08a5a9f403 100644 --- a/firmware/tunerstudio/generated/rusefi_uaefi121.ini +++ b/firmware/tunerstudio/generated/rusefi_uaefi121.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2025.01.17.uaefi121.4109352281" + signature = "rusEFI master.2025.01.17.uaefi121.4064367879" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2025.01.17.uaefi121.4109352281" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2025.01.17.uaefi121.4064367879" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -3590,7 +3590,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 egoCorrectionForVeAnalyze = { 100 + fuelPidCorrection1 } - wbo0_hasFault = { enableAemXSeries && ((faultCode0 >= 3) && (faultCode0 != 7)) } + wbo0_hasFault = { enableAemXSeries && ((wb1faultCode >= 3) && (wb1faultCode != 7)) } [PcVariables] fuelUnits = bits, U08, [0:2], "kPa", "MAF", "%TPS", "Lua" @@ -3633,7 +3633,7 @@ lambdaTimeSinceGood = scalar, U16, 1796, "sec", 0.01, 0 ignModeList = bits, U08, [0:3], "Single Coil", "Sequential", "Wasted", "Two Coils" ; ClearReason - fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "fault RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake" + fuelIgnCutCodeList = bits, U08, [0:7], "None", "fatal error", "setting disabled", "RPM limit", "ETB RPM limit", "boost cut", "oil pressure", "stop requested", "ETB problem", "launch control", "max injector duty", "flood clear", "engine sync", "kickstart", "ign off", "Lua", "ACR", "Lambda Prot", "GDI Comms", "Brake", "Fatal" ; TpsState etbCutCodeList = bits, U08, [0:7], "None", "engine stopped", "TPS error", "PPS error", "TPS noise", "Autotune", "Lua", "INVALID", "N/A", "Redundancy", "PPS noise", "Jam" @@ -4874,16 +4874,16 @@ luaOpenLoopAddGauge = luaOpenLoopAdd,"Boost: Lua open loop add", "v", -100.0,100 boostControllerClosedLoopPartGauge = boostControllerClosedLoopPart,"Boost: Closed loop", "%", -50.0,50.0, -50.0,50.0, -50.0,50.0, 1,1 boostControlTargetGauge = boostControlTarget,"Boost: Target", "kPa", 0.0,300.0, 0.0,300.0, 0.0,300.0, 1,1 gaugeCategory = "ETB more" -targetWithIdlePosition0Gauge = targetWithIdlePosition0,"ETB: target with idle0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment0Gauge = luaAdjustment0,"ETB: luaAdjustment0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition0Gauge = m_wastegatePosition0,"DC: wastegatePosition0", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -targetWithIdlePosition1Gauge = targetWithIdlePosition1,"ETB: target with idle1", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 -luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 -etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 -etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1targetWithIdlePositionGauge = etb1targetWithIdlePosition,"etb1 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb1luaAdjustmentGauge = etb1luaAdjustment,"etb1 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1m_wastegatePositionGauge = etb1m_wastegatePosition,"etb1 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb1etbTpsErrorCounterGauge = etb1etbTpsErrorCounter,"etb1 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb1etbPpsErrorCounterGauge = etb1etbPpsErrorCounter,"etb1 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2targetWithIdlePositionGauge = etb2targetWithIdlePosition,"etb2 ETB: target with idle", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +etb2luaAdjustmentGauge = etb2luaAdjustment,"etb2 ETB: luaAdjustment", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2m_wastegatePositionGauge = etb2m_wastegatePosition,"etb2 DC: wastegatePosition", "%", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etb2etbTpsErrorCounterGauge = etb2etbTpsErrorCounter,"etb2 ETB TPS error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etb2etbPpsErrorCounterGauge = etb2etbPpsErrorCounter,"etb2 ETB pedal error counter", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "%", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 gaugeCategory = "Sensors - SENT" @@ -5281,12 +5281,12 @@ gaugeCategory = GPPWM Outputs indicator = { isTriggerError}, "Trigger OK", "Trigger ERR", white, black, red, black indicator = { fuelCutReasonBlinker != 0 }, "Injection OK", { Fuel cut: bitStringValue(fuelIgnCutCodeList, fuelCutReason)}, white, black, yellow, black indicator = { sparkCutReasonBlinker != 0 }, "Ignition OK", { Ign cut: bitStringValue(fuelIgnCutCodeList, sparkCutReason)}, white, black, yellow, black - indicator = { etbErrorCodeBlinker0 != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etbErrorCode0)}, white, black, yellow, black + indicator = { etb1etbErrorCodeBlinker != 0 }, "ETB OK", { ETB: bitStringValue(etbCutCodeList, etb1etbErrorCode)}, white, black, yellow, black ; minor info indicator = { fan1m_state }, "Fan off", "Fan on", white, black, green, black indicator = { fan2m_state }, "Fan 2 off", "Fan 2 on", white, black, green, black - indicator = { isMainRelayOn }, "Main relay off", "Main relay on", white, black, green, black + indicator = { mainRelayState }, "Main relay off", "Main relay on", white, black, green, black ; Line 2 ; = expression, off-label, on-label, off-bg, off-fg, on-bg, on-fg indicator = { isFuelPumpOn }, "Fuel pump off", "Fuel pump on", white, black, green, black @@ -5315,9 +5315,9 @@ gaugeCategory = GPPWM Outputs indicator = { sd_msd }, "No SD USB", "SD USB", white, black, green, black ; indicator = { sd_active_wr }, "SD WR", "SD WR", white, black, green, black ; indicator = { sd_active_rd }, "SD RD", "SD RD", white, black, green, black - indicator = { etbRevLimitActive0 }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black + indicator = { etb1etbRevLimitActive }, "No ETB RPM Limit", "ETB RPM Limit", white, black, yellow, black - indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, { WBO0: bitStringValue(wboFaultCodeList, faultCode0)}, white, black, red, black + indicator = { wbo0_hasFault }, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, { WBO0: bitStringValue(wboFaultCodeList, wb1faultCode)}, white, black, red, black ; indicator = { isInjectionEnabled && fuelCutReason == 0 }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, { Inj: bitStringValue(injModeList, currentInjectionMode) }, white, black, white, black ; indicator = { isIgnitionEnabled && sparkCutReason == 0 }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, { Ign: bitStringValue(ignModeList, currentIgnitionMode) }, white, black, white, black @@ -5922,26 +5922,26 @@ entry = isNitrousMapCondition, "isNitrousMapCondition", int, "%d" entry = isNitrousAfrCondition, "isNitrousAfrCondition", int, "%d" entry = isNitrousRpmCondition, "isNitrousRpmCondition", int, "%d" entry = isNitrousCondition, "isNitrousCondition", int, "%d" -entry = cranking, "fan1cranking", int, "%d" -entry = notRunning, "fan1notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" -entry = brokenClt, "fan1Broken CLT", int, "%d" -entry = enabledForAc, "fan1Enable for AC", int, "%d" -entry = hot, "fan1Above hot threshold", int, "%d" -entry = cold, "fan1Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan1disabledBySpeed", int, "%d" -entry = m_state, "fan1On", int, "%d" -entry = radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" -entry = cranking, "fan2cranking", int, "%d" -entry = notRunning, "fan2notRunning", int, "%d" -entry = disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" -entry = brokenClt, "fan2Broken CLT", int, "%d" -entry = enabledForAc, "fan2Enable for AC", int, "%d" -entry = hot, "fan2Above hot threshold", int, "%d" -entry = cold, "fan2Below cold threshold", int, "%d" -entry = disabledBySpeed, "fan2disabledBySpeed", int, "%d" -entry = m_state, "fan2On", int, "%d" -entry = radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" +entry = fan1cranking, "fan1cranking", int, "%d" +entry = fan1notRunning, "fan1notRunning", int, "%d" +entry = fan1disabledWhileEngineStopped, "fan1Engine stopped", int, "%d" +entry = fan1brokenClt, "fan1Broken CLT", int, "%d" +entry = fan1enabledForAc, "fan1Enable for AC", int, "%d" +entry = fan1hot, "fan1Above hot threshold", int, "%d" +entry = fan1cold, "fan1Below cold threshold", int, "%d" +entry = fan1disabledBySpeed, "fan1disabledBySpeed", int, "%d" +entry = fan1m_state, "fan1On", int, "%d" +entry = fan1radiatorFanStatus, "fan1radiatorFanStatus", int, "%d" +entry = fan2cranking, "fan2cranking", int, "%d" +entry = fan2notRunning, "fan2notRunning", int, "%d" +entry = fan2disabledWhileEngineStopped, "fan2Engine stopped", int, "%d" +entry = fan2brokenClt, "fan2Broken CLT", int, "%d" +entry = fan2enabledForAc, "fan2Enable for AC", int, "%d" +entry = fan2hot, "fan2Above hot threshold", int, "%d" +entry = fan2cold, "fan2Below cold threshold", int, "%d" +entry = fan2disabledBySpeed, "fan2disabledBySpeed", int, "%d" +entry = fan2m_state, "fan2On", int, "%d" +entry = fan2radiatorFanStatus, "fan2radiatorFanStatus", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -6028,51 +6028,51 @@ entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = triggerElapsedUs, "triggerElapsedUs", int, "%d" -entry = synchronizationCounter, "trgsync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "trgvvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "trgtriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt1etriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2itriggerStateIndex", int, "%d" -entry = synchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" -entry = vvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" -entry = vvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" -entry = vvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" -entry = vvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" -entry = vvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" -entry = vvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" -entry = triggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "vvt2etriggerStateIndex", int, "%d" +entry = trgsynchronizationCounter, "trgsync: wheel sync counter", int, "%d" +entry = trgvvtToothDurations0, "trgvvtToothDurations0", int, "%d" +entry = trgvvtCurrentPosition, "trgsync: Primary Position", float, "%.3f" +entry = trgvvtToothPosition1, "trgsync: Cam Position 1", float, "%.3f" +entry = trgvvtToothPosition2, "trgsync: Cam Position 2", float, "%.3f" +entry = trgvvtToothPosition3, "trgsync: Cam Position 3", float, "%.3f" +entry = trgvvtToothPosition4, "trgsync: Cam Position 4", float, "%.3f" +entry = trgtriggerSyncGapRatio, "trgSync: Trigger Latest Ratio", float, "%.3f" +entry = trgtriggerStateIndex, "trgtriggerStateIndex", int, "%d" +entry = vvt1isynchronizationCounter, "vvt1isync: wheel sync counter", int, "%d" +entry = vvt1ivvtToothDurations0, "vvt1ivvtToothDurations0", int, "%d" +entry = vvt1ivvtCurrentPosition, "vvt1isync: Primary Position", float, "%.3f" +entry = vvt1ivvtToothPosition1, "vvt1isync: Cam Position 1", float, "%.3f" +entry = vvt1ivvtToothPosition2, "vvt1isync: Cam Position 2", float, "%.3f" +entry = vvt1ivvtToothPosition3, "vvt1isync: Cam Position 3", float, "%.3f" +entry = vvt1ivvtToothPosition4, "vvt1isync: Cam Position 4", float, "%.3f" +entry = vvt1itriggerSyncGapRatio, "vvt1iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1itriggerStateIndex, "vvt1itriggerStateIndex", int, "%d" +entry = vvt1esynchronizationCounter, "vvt1esync: wheel sync counter", int, "%d" +entry = vvt1evvtToothDurations0, "vvt1evvtToothDurations0", int, "%d" +entry = vvt1evvtCurrentPosition, "vvt1esync: Primary Position", float, "%.3f" +entry = vvt1evvtToothPosition1, "vvt1esync: Cam Position 1", float, "%.3f" +entry = vvt1evvtToothPosition2, "vvt1esync: Cam Position 2", float, "%.3f" +entry = vvt1evvtToothPosition3, "vvt1esync: Cam Position 3", float, "%.3f" +entry = vvt1evvtToothPosition4, "vvt1esync: Cam Position 4", float, "%.3f" +entry = vvt1etriggerSyncGapRatio, "vvt1eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt1etriggerStateIndex, "vvt1etriggerStateIndex", int, "%d" +entry = vvt2isynchronizationCounter, "vvt2isync: wheel sync counter", int, "%d" +entry = vvt2ivvtToothDurations0, "vvt2ivvtToothDurations0", int, "%d" +entry = vvt2ivvtCurrentPosition, "vvt2isync: Primary Position", float, "%.3f" +entry = vvt2ivvtToothPosition1, "vvt2isync: Cam Position 1", float, "%.3f" +entry = vvt2ivvtToothPosition2, "vvt2isync: Cam Position 2", float, "%.3f" +entry = vvt2ivvtToothPosition3, "vvt2isync: Cam Position 3", float, "%.3f" +entry = vvt2ivvtToothPosition4, "vvt2isync: Cam Position 4", float, "%.3f" +entry = vvt2itriggerSyncGapRatio, "vvt2iSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2itriggerStateIndex, "vvt2itriggerStateIndex", int, "%d" +entry = vvt2esynchronizationCounter, "vvt2esync: wheel sync counter", int, "%d" +entry = vvt2evvtToothDurations0, "vvt2evvtToothDurations0", int, "%d" +entry = vvt2evvtCurrentPosition, "vvt2esync: Primary Position", float, "%.3f" +entry = vvt2evvtToothPosition1, "vvt2esync: Cam Position 1", float, "%.3f" +entry = vvt2evvtToothPosition2, "vvt2esync: Cam Position 2", float, "%.3f" +entry = vvt2evvtToothPosition3, "vvt2esync: Cam Position 3", float, "%.3f" +entry = vvt2evvtToothPosition4, "vvt2esync: Cam Position 4", float, "%.3f" +entry = vvt2etriggerSyncGapRatio, "vvt2eSync: Trigger Latest Ratio", float, "%.3f" +entry = vvt2etriggerStateIndex, "vvt2etriggerStateIndex", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -6104,56 +6104,56 @@ entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" entry = targetRpmAc, "Idle: Target A/C RPM", int, "%d" entry = iacByRpmTaper, "idle: iacByRpmTaper portion", float, "%.3f" entry = luaAdd, "idle: Lua Adder", float, "%.3f" -entry = targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" -entry = trim, "etb1ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb1etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb1etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb1Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" -entry = jamDetected, "etb1jamDetected", int, "%d" -entry = validPlantPosition, "etb1validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb1etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb1ETB traction control", int, "%d" -entry = jamTimer, "etb1ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" -entry = state, "etb1state", int, "%d" -entry = targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" -entry = trim, "etb2ETB: trim", float, "%.3f" -entry = luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etb2etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etb2etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" -entry = m_adjustedTarget, "etb2Adjusted target", float, "%.3f" -entry = etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" -entry = jamDetected, "etb2jamDetected", int, "%d" -entry = validPlantPosition, "etb2validPlantPosition", int, "%d" -entry = etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etb2etbErrorCode", int, "%d" -entry = etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" -entry = tcEtbDrop, "etb2ETB traction control", int, "%d" -entry = jamTimer, "etb2ETB jam timer", float, "%.3f" -entry = adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" -entry = state, "etb2state", int, "%d" -entry = faultCode, "wb1WBO: Fault code", int, "%d" -entry = heaterDuty, "wb1WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb1WBO: Pump duty", int, "%d" -entry = tempC, "wb1WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb1WBO: ESR", int, "%d" -entry = faultCode, "wb2WBO: Fault code", int, "%d" -entry = heaterDuty, "wb2WBO: Heater duty", int, "%d" -entry = pumpDuty, "wb2WBO: Pump duty", int, "%d" -entry = tempC, "wb2WBO: Temperature", int, "%d" -entry = nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" -entry = esr, "wb2WBO: ESR", int, "%d" +entry = etb1targetWithIdlePosition, "etb1ETB: target with idle", float, "%.3f" +entry = etb1trim, "etb1ETB: trim", float, "%.3f" +entry = etb1luaAdjustment, "etb1ETB: luaAdjustment", float, "%.3f" +entry = etb1m_wastegatePosition, "etb1DC: wastegatePosition", float, "%.3f" +entry = etb1etbFeedForward, "etb1etbFeedForward", float, "%.3f" +entry = etb1etbIntegralError, "etb1etbIntegralError", float, "%.3f" +entry = etb1etbCurrentTarget, "etb1ETB: target for current pedal", float, "%.3f" +entry = etb1m_adjustedTarget, "etb1Adjusted target", float, "%.3f" +entry = etb1etbRevLimitActive, "etb1etbRevLimitActive", int, "%d" +entry = etb1jamDetected, "etb1jamDetected", int, "%d" +entry = etb1validPlantPosition, "etb1validPlantPosition", int, "%d" +entry = etb1etbTpsErrorCounter, "etb1ETB TPS error counter", int, "%d" +entry = etb1etbPpsErrorCounter, "etb1ETB pedal error counter", int, "%d" +entry = etb1etbErrorCode, "etb1etbErrorCode", int, "%d" +entry = etb1etbErrorCodeBlinker, "etb1etbErrorCodeBlinker", int, "%d" +entry = etb1tcEtbDrop, "etb1ETB traction control", int, "%d" +entry = etb1jamTimer, "etb1ETB jam timer", float, "%.3f" +entry = etb1adjustedEtbTarget, "etb1ETB with adjustments", int, "%d" +entry = etb1state, "etb1state", int, "%d" +entry = etb2targetWithIdlePosition, "etb2ETB: target with idle", float, "%.3f" +entry = etb2trim, "etb2ETB: trim", float, "%.3f" +entry = etb2luaAdjustment, "etb2ETB: luaAdjustment", float, "%.3f" +entry = etb2m_wastegatePosition, "etb2DC: wastegatePosition", float, "%.3f" +entry = etb2etbFeedForward, "etb2etbFeedForward", float, "%.3f" +entry = etb2etbIntegralError, "etb2etbIntegralError", float, "%.3f" +entry = etb2etbCurrentTarget, "etb2ETB: target for current pedal", float, "%.3f" +entry = etb2m_adjustedTarget, "etb2Adjusted target", float, "%.3f" +entry = etb2etbRevLimitActive, "etb2etbRevLimitActive", int, "%d" +entry = etb2jamDetected, "etb2jamDetected", int, "%d" +entry = etb2validPlantPosition, "etb2validPlantPosition", int, "%d" +entry = etb2etbTpsErrorCounter, "etb2ETB TPS error counter", int, "%d" +entry = etb2etbPpsErrorCounter, "etb2ETB pedal error counter", int, "%d" +entry = etb2etbErrorCode, "etb2etbErrorCode", int, "%d" +entry = etb2etbErrorCodeBlinker, "etb2etbErrorCodeBlinker", int, "%d" +entry = etb2tcEtbDrop, "etb2ETB traction control", int, "%d" +entry = etb2jamTimer, "etb2ETB jam timer", float, "%.3f" +entry = etb2adjustedEtbTarget, "etb2ETB with adjustments", int, "%d" +entry = etb2state, "etb2state", int, "%d" +entry = wb1faultCode, "wb1WBO: Fault code", int, "%d" +entry = wb1heaterDuty, "wb1WBO: Heater duty", int, "%d" +entry = wb1pumpDuty, "wb1WBO: Pump duty", int, "%d" +entry = wb1tempC, "wb1WBO: Temperature", int, "%d" +entry = wb1nernstVoltage, "wb1WBO: Nernst Voltage", float, "%.3f" +entry = wb1esr, "wb1WBO: ESR", int, "%d" +entry = wb2faultCode, "wb2WBO: Fault code", int, "%d" +entry = wb2heaterDuty, "wb2WBO: Heater duty", int, "%d" +entry = wb2pumpDuty, "wb2WBO: Pump duty", int, "%d" +entry = wb2tempC, "wb2WBO: Temperature", int, "%d" +entry = wb2nernstVoltage, "wb2WBO: Nernst Voltage", float, "%.3f" +entry = wb2esr, "wb2WBO: ESR", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -8555,30 +8555,30 @@ dialog = lambda_monitorDialog, "lambda_monitor" dialog = egoSettings_IO2, "O2 Sensor 2 I/O" field = "Input channel", afr_hwChannel2 - indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode0 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicator = { faultCode0 == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black + indicatorPanel = uegoCan0Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb1faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicator = { wb1faultCode == 8 }, "AEM OK", "AEM ERROR", green, black, yellow, black - indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (faultCode0 == 7 || faultCode0 == 8) } - indicator = { faultCode1 == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black + indicatorPanel = uegoCan1Indicators, 1, { enableAemXSeries == 1 && (wb1faultCode == 7 || wb1faultCode == 8) } + indicator = { wb2faultCode == 7 }, "RusEFI WBO", "AEM Gauge", green, black, yellow, black - indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode0 != 7 && faultCode0 != 8 } - indicator = { faultCode0 == 0 || faultCode0 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode0 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode0 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode0 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode0 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode0 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode0 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan0IndicatorsExt, 1, { enableAemXSeries == 1 && wb1faultCode != 7 && wb1faultCode != 8 } + indicator = { wb1faultCode == 0 || wb1faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb1faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb1faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb1faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb1faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb1faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb1faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black - indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && faultCode1 != 7 && faultCode0 != 8 } - indicator = { faultCode1 == 0 || faultCode1 == 7 }, "Failed", "Ready/Ok", red, black, green, black - indicator = { faultCode1 == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black - indicator = { faultCode1 == 1 }, "Communication ok", "Timeout reading", green, black, red, black - indicator = { faultCode1 == 3 }, "No heating failure", "Heating failed", green, black, red, black - indicator = { faultCode1 == 4 }, "No overheat", "Overheat", green, black, red, black - indicator = { faultCode1 == 5 }, "No underheat", "Underheat", green, black, red, black - indicator = { faultCode1 == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black + indicatorPanel = uegoCan1IndicatorsExt, 1, { enableAemXSeries == 1 && wb2faultCode != 7 && wb1faultCode != 8 } + indicator = { wb2faultCode == 0 || wb2faultCode == 7 }, "Failed", "Ready/Ok", red, black, green, black + indicator = { wb2faultCode == 2 }, "Heating allowed", "Heating prohibited", green, black, yellow, black + indicator = { wb2faultCode == 1 }, "Communication ok", "Timeout reading", green, black, red, black + indicator = { wb2faultCode == 3 }, "No heating failure", "Heating failed", green, black, red, black + indicator = { wb2faultCode == 4 }, "No overheat", "Overheat", green, black, red, black + indicator = { wb2faultCode == 5 }, "No underheat", "Underheat", green, black, red, black + indicator = { wb2faultCode == 6 }, "Heater supply ok", "No heater supply", green, black, yellow, black dialog = uegoCanStatus, "CAN UEGO 1, 2 Status", border panel = uegoCan0Indicators, West diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 30df68c888..2634c90204 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1245,7 +1245,7 @@ public class Fields { public static final int SentInput_INPUT6 = 6; public static final int SentInput_INPUT7 = 7; public static final int SentInput_NONE = 0; - public static final int SIGNATURE_HASH = 1051935834; + public static final int SIGNATURE_HASH = 941468676; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX = "generated/simulator_tune_image"; public static final String SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX = ".bin"; @@ -1511,7 +1511,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2025.01.17.f407-discovery.1051935834"; + public static final String TS_SIGNATURE = "rusEFI master.2025.01.17.f407-discovery.941468676"; public static final char TS_SIMULATE_CAN = '>'; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't';