From 1dbb810345af3c4424c1af49b11c0aea73f8d92d Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 18 Apr 2022 04:38:09 +0000 Subject: [PATCH] Auto-generated configs and docs --- .../binary/generated/fancy_content.ini | 234 ++++++++--------- firmware/tunerstudio/generated/rusefi.ini | 236 ++++++++---------- .../generated/rusefi_alphax-2chan.ini | 236 ++++++++---------- .../generated/rusefi_alphax-4chan.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_atlas.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_core8.ini | 236 ++++++++---------- .../generated/rusefi_f429-discovery.ini | 236 ++++++++---------- .../generated/rusefi_frankenso_na6.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_harley81.ini | 236 ++++++++---------- .../generated/rusefi_hellen-nb1.ini | 236 ++++++++---------- .../generated/rusefi_hellen121nissan.ini | 236 ++++++++---------- .../generated/rusefi_hellen121vag.ini | 236 ++++++++---------- .../generated/rusefi_hellen128mercedes.ini | 236 ++++++++---------- .../generated/rusefi_hellen154hyundai.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_hellen72.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_hellen81.ini | 236 ++++++++---------- .../generated/rusefi_hellen88bmw.ini | 236 ++++++++---------- .../generated/rusefi_hellenNA6.ini | 236 ++++++++---------- .../generated/rusefi_hellenNA8_96.ini | 236 ++++++++---------- .../generated/rusefi_hellen_cypress.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_kinetis.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_mre_f4.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_mre_f7.ini | 236 ++++++++---------- .../generated/rusefi_prometheus_405.ini | 236 ++++++++---------- .../generated/rusefi_prometheus_469.ini | 236 ++++++++---------- .../generated/rusefi_proteus_f4.ini | 236 ++++++++---------- .../generated/rusefi_proteus_f7.ini | 236 ++++++++---------- .../generated/rusefi_proteus_h7.ini | 236 ++++++++---------- .../generated/rusefi_subaru_eg33_f7.ini | 236 ++++++++---------- .../tunerstudio/generated/rusefi_tdg-pdm8.ini | 236 ++++++++---------- 30 files changed, 3269 insertions(+), 3809 deletions(-) diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index d654a2fdb0..3293ebd75e 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -3,27 +3,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -37,12 +32,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -51,13 +44,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -68,13 +59,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -85,7 +74,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -95,7 +83,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -105,40 +92,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -148,57 +148,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -219,37 +208,30 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 161a623de4..5c00eba240 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:36:02 UTC 2022 pageSize = 21012 page = 1 @@ -6091,27 +6091,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6125,12 +6120,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6139,13 +6132,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6156,13 +6147,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6173,7 +6162,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6183,7 +6171,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6193,40 +6180,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6236,57 +6236,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6307,39 +6296,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 0d0134a986..e6d2d9dd02 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:03 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:31 UTC 2022 pageSize = 21012 page = 1 @@ -6072,27 +6072,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6106,12 +6101,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6120,13 +6113,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6137,13 +6128,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6154,7 +6143,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6164,7 +6152,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6174,40 +6161,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6217,57 +6217,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6288,39 +6277,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index 4bb198dac3..8ddd622b56 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:05 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:32 UTC 2022 pageSize = 21012 page = 1 @@ -6073,27 +6073,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6107,12 +6102,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6121,13 +6114,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6138,13 +6129,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6155,7 +6144,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6165,7 +6153,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6175,40 +6162,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6218,57 +6218,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6289,39 +6278,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index a63fb0e521..47fa4a49fe 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:37 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:59 UTC 2022 pageSize = 21012 page = 1 @@ -6083,27 +6083,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6117,12 +6112,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6131,13 +6124,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6148,13 +6139,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6165,7 +6154,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6175,7 +6163,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6185,40 +6172,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6228,57 +6228,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6299,39 +6288,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 2c547dd850..0ea916784b 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:49 UTC 2022 pageSize = 21012 page = 1 @@ -6086,27 +6086,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6120,12 +6115,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6134,13 +6127,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6151,13 +6142,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6168,7 +6157,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6178,7 +6166,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6188,40 +6175,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6231,57 +6231,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6302,39 +6291,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 266a2625d8..525adff0f1 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:58 UTC 2022 pageSize = 21012 page = 1 @@ -6091,27 +6091,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6125,12 +6120,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6139,13 +6132,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6156,13 +6147,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6173,7 +6162,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6183,7 +6171,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6193,40 +6180,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6236,57 +6236,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6307,39 +6296,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 5928b7bd72..ba41d6b72a 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:51 UTC 2022 pageSize = 21012 page = 1 @@ -6091,27 +6091,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6125,12 +6120,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6139,13 +6132,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6156,13 +6147,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6173,7 +6162,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6183,7 +6171,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6193,40 +6180,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6236,57 +6236,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6307,39 +6296,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index d313d93db3..ad286ee33d 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:34 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 29e60b7146..9b1c288a1d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:18 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:43 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 8de99f753e..304bbf6870 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:37 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index fd2c661c54..1f6d2b41af 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:36 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index e78a6cb9eb..71303302ed 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:08 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:35 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 6b2a7c7cb1..8fc9047658 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:12 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:38 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index f1c33bfa5d..aa7c5d4702 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:41 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 67b0a7c6c5..05fae2d3c3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:42 UTC 2022 pageSize = 21012 page = 1 @@ -6074,27 +6074,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6108,12 +6103,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6122,13 +6115,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6139,13 +6130,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6156,7 +6145,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6166,7 +6154,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6176,40 +6163,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6219,57 +6219,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6290,39 +6279,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index fa1d9f4b3b..2893bca3a6 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:14 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:40 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 994f8989ed..968227075c 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:20 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:45 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 74c8c39e22..62ff02c256 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:46 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 3b9cc5a875..a174a50ecd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 03:36:43 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Apr 18 04:36:04 UTC 2022 pageSize = 21012 page = 1 @@ -6091,27 +6091,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6125,12 +6120,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6139,13 +6132,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6156,13 +6147,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6173,7 +6162,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6183,7 +6171,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6193,40 +6180,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6236,57 +6236,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6307,39 +6296,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a0c0867778..a7792f3ef3 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 03:36:41 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Apr 18 04:36:03 UTC 2022 pageSize = 20984 page = 1 @@ -6058,27 +6058,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6092,12 +6087,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6106,13 +6099,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6123,13 +6114,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6140,7 +6129,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6150,7 +6138,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6160,40 +6147,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6203,57 +6203,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6274,39 +6263,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 66926cce86..ee46abd0be 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:24 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:48 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index b0cc13235f..f341efe671 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:47 UTC 2022 pageSize = 21012 page = 1 @@ -6075,27 +6075,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6109,12 +6104,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6123,13 +6116,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6140,13 +6131,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6157,7 +6146,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6167,7 +6155,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6177,40 +6164,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6220,57 +6220,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6291,39 +6280,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f9abf3d907..7f3dbd77fe 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:30 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:53 UTC 2022 pageSize = 21012 page = 1 @@ -6086,27 +6086,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6120,12 +6115,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6134,13 +6127,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6151,13 +6142,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6168,7 +6157,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6178,7 +6166,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6188,40 +6175,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6231,57 +6231,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6302,39 +6291,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 08bdae0c25..543777884e 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:28 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:52 UTC 2022 pageSize = 21012 page = 1 @@ -6086,27 +6086,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6120,12 +6115,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6134,13 +6127,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6151,13 +6142,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6168,7 +6157,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6178,7 +6166,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6188,40 +6175,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6231,57 +6231,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6302,39 +6291,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 8989500a56..96a25a6476 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:56 UTC 2022 pageSize = 21012 page = 1 @@ -6068,27 +6068,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6102,12 +6097,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6116,13 +6109,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6133,13 +6124,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6150,7 +6139,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6160,7 +6148,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6170,40 +6157,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6213,57 +6213,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6284,39 +6273,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index b6373987d3..28c0b8add3 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:31 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:54 UTC 2022 pageSize = 21012 page = 1 @@ -6068,27 +6068,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6102,12 +6097,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6116,13 +6109,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6133,13 +6124,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6150,7 +6139,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6160,7 +6148,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6170,40 +6157,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6213,57 +6213,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6284,39 +6273,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 912f4389a2..3fd04afd05 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:34 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:35:57 UTC 2022 pageSize = 21012 page = 1 @@ -6068,27 +6068,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6102,12 +6097,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6116,13 +6109,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6133,13 +6124,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6150,7 +6139,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6160,7 +6148,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6170,40 +6157,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6213,57 +6213,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6284,39 +6273,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index e0d2da01bc..1a05148c14 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Apr 18 04:36:05 UTC 2022 pageSize = 21012 page = 1 @@ -6085,27 +6085,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6119,12 +6114,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6133,13 +6126,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6150,13 +6141,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6167,7 +6156,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6177,7 +6165,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6187,40 +6174,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6230,57 +6230,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6301,39 +6290,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index a790432ab4..e769b5e387 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -84,7 +84,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 03:36:39 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Apr 18 04:36:00 UTC 2022 pageSize = 21012 page = 1 @@ -6091,27 +6091,22 @@ indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 indicator = {angleAboveMin}, "No", "Yes" indicator = {isHpfpInactive}, "No", "Yes" -liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe -liveGraph = high_pressure_fuel_pump_3_Graph, "Graph", South - graphLine = nextStart - dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" panel = high_pressure_fuel_pumpIndicatorPanel - panel = high_pressure_fuel_pump_1_Graph - panel = high_pressure_fuel_pump_3_Graph + liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South + graphLine = m_requested_pump + graphLine = fuel_requested_percent + graphLine = fuel_requested_percent_pi + graphLine = nextLobe + liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South + graphLine = nextStart -liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - dialog = injector_modelDialog, "injector_model" - panel = injector_model_1_Graph + liveGraph = injector_model_1_Graph, "Graph", South + graphLine = m_deadtime + graphLine = pressureDelta + graphLine = pressureRatio indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {combinedConditions}, "No", "Yes" @@ -6125,12 +6120,10 @@ indicatorPanel = launch_control_stateIndicatorPanel, 2 indicator = {speedCondition}, "No", "Yes" indicator = {tpsCondition}, "No", "Yes" -liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - dialog = launch_control_stateDialog, "launch_control_state" panel = launch_control_stateIndicatorPanel - panel = launch_control_state_1_Graph + liveGraph = launch_control_state_1_Graph, "Graph", South + graphLine = retardThresholdRpm indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isTpsInvalid}, "No", "Yes" @@ -6139,13 +6132,11 @@ indicatorPanel = boost_controlIndicatorPanel, 2 indicator = {isNotClosedLoop}, "No", "Yes" indicator = {isZeroRpm}, "No", "Yes" -liveGraph = boost_control_1_Graph, "Graph", South - graphLine = openLoopPart - graphLine = closedLoopPart - dialog = boost_controlDialog, "boost_control" panel = boost_controlIndicatorPanel - panel = boost_control_1_Graph + liveGraph = boost_control_1_Graph, "Graph", South + graphLine = openLoopPart + graphLine = closedLoopPart indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {engineTooSlow}, "No", "Yes" @@ -6156,13 +6147,11 @@ indicatorPanel = ac_controlIndicatorPanel, 2 indicator = {acButtonState}, "No", "Yes" indicator = {isDisabledByLua}, "No", "Yes" -liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel - panel = ac_control_1_Graph + liveGraph = ac_control_1_Graph, "Graph", South + graphLine = latest_usage_ac_control + graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {cranking}, "No", "Yes" @@ -6173,7 +6162,6 @@ indicatorPanel = fan_controlIndicatorPanel, 2 indicator = {hot}, "No", "Yes" indicator = {cold}, "No", "Yes" - dialog = fan_controlDialog, "fan_control" panel = fan_controlIndicatorPanel @@ -6183,7 +6171,6 @@ indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPumpOn}, "No", "Yes" indicator = {ignitionOn}, "No", "Yes" - dialog = fuel_pump_controlDialog, "fuel_pump_control" panel = fuel_pump_controlIndicatorPanel @@ -6193,40 +6180,53 @@ indicatorPanel = main_relayIndicatorPanel, 2 indicator = {mainRelayState}, "No", "Yes" indicator = {delayedShutoffRequested}, "No", "Yes" - dialog = main_relayDialog, "main_relay" panel = main_relayIndicatorPanel - -liveGraph = engine_state_1_Graph, "Graph", South - graphLine = sd - graphLine = targetAFR - graphLine = engineCycleDurationMs - graphLine = minRpmKcurrentTPS -liveGraph = engine_state_3_Graph, "Graph", South - graphLine = currentTpsAdc - graphLine = tpsVoltageMCU - graphLine = tpsVoltageBoard - graphLine = currentBaroCorrectedVE -liveGraph = engine_state_5_Graph, "Graph", South - graphLine = injectorFlowCorrection - graphLine = baroCorrection - graphLine = cranking - graphLine = running -liveGraph = engine_state_7_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = targetFromTable - graphLine = sparkDwell - graphLine = dwellAngle -liveGraph = engine_state_9_Graph, "Graph", South - graphLine = cltTimingCorrection +indicatorPanel = engine_stateIndicatorPanel, 2 + indicator = {isTChargeAirModel}, "No", "Yes" dialog = engine_stateDialog, "engine_state" - panel = engine_state_1_Graph - panel = engine_state_3_Graph - panel = engine_state_5_Graph - panel = engine_state_7_Graph - panel = engine_state_9_Graph + panel = engine_stateIndicatorPanel + liveGraph = engine_state_1_Graph, "Graph", South + graphLine = sd_airMassInOneCylinder + graphLine = sd_tCharge + graphLine = sd_tChargeK + graphLine = sd_Tcharge_coff + liveGraph = engine_state_2_Graph, "Graph", South + graphLine = sd_airFlow + graphLine = targetAFR + graphLine = engineCycleDurationMs + graphLine = minRpmKcurrentTPS + liveGraph = engine_state_3_Graph, "Graph", South + graphLine = currentTpsAdc + graphLine = tpsVoltageMCU + graphLine = tpsVoltageBoard + graphLine = currentBaroCorrectedVE + liveGraph = engine_state_4_Graph, "Graph", South + graphLine = injectorFlowCorrection + graphLine = baroCorrection + graphLine = cranking_baseFuel + graphLine = cranking_coolantTemperatureCoefficient + liveGraph = engine_state_5_Graph, "Graph", South + graphLine = cranking_tpsCoefficient + graphLine = cranking_durationCoefficient + graphLine = cranking_fuel + graphLine = running_postCrankingFuelCorrection + liveGraph = engine_state_6_Graph, "Graph", South + graphLine = running_intakeTemperatureCoefficient + graphLine = running_coolantTemperatureCoefficient + graphLine = running_timeSinceCrankingInSecs + graphLine = running_injectorLag + liveGraph = engine_state_7_Graph, "Graph", South + graphLine = running_baseFuel + graphLine = running_fuel + graphLine = etbFeedForward + graphLine = targetFromTable + liveGraph = engine_state_8_Graph, "Graph", South + graphLine = sparkDwell + graphLine = dwellAngle + graphLine = cltTimingCorrection indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {isAboveAccelThreshold}, "No", "Yes" @@ -6236,57 +6236,46 @@ indicatorPanel = tps_accel_stateIndicatorPanel, 2 indicator = {belowEpsilon}, "No", "Yes" indicator = {tooShort}, "No", "Yes" -liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel -liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle -liveGraph = tps_accel_state_5_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - dialog = tps_accel_stateDialog, "tps_accel_state" panel = tps_accel_stateIndicatorPanel - panel = tps_accel_state_1_Graph - panel = tps_accel_state_3_Graph - panel = tps_accel_state_5_Graph + liveGraph = tps_accel_state_1_Graph, "Graph", South + graphLine = tpsFrom + graphLine = tpsTo + graphLine = deltaTps + graphLine = extraFuel + liveGraph = tps_accel_state_2_Graph, "Graph", South + graphLine = valueFromTable + graphLine = fractionalInjFuel + graphLine = accumulatedValue + graphLine = maxExtraPerCycle + liveGraph = tps_accel_state_3_Graph, "Graph", South + graphLine = maxExtraPerPeriod + graphLine = maxInjectedPerPeriod + graphLine = cycleCnt -liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 -liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - dialog = trigger_centralDialog, "trigger_central" - panel = trigger_central_1_Graph - panel = trigger_central_3_Graph + liveGraph = trigger_central_1_Graph, "Graph", South + graphLine = hwEventCounters1 + graphLine = hwEventCounters2 + graphLine = hwEventCounters3 + graphLine = hwEventCounters4 + liveGraph = trigger_central_2_Graph, "Graph", South + graphLine = hwEventCounters5 + graphLine = hwEventCounters6 + graphLine = vvtCamCounter -liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = currentGap - graphLine = totalRevolutionCounter - dialog = trigger_stateDialog, "trigger_state" - panel = trigger_state_1_Graph + liveGraph = trigger_state_1_Graph, "Graph", South + graphLine = currentGap + graphLine = totalRevolutionCounter -liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - dialog = wall_fuel_stateDialog, "wall_fuel_state" - panel = wall_fuel_state_1_Graph + liveGraph = wall_fuel_state_1_Graph, "Graph", South + graphLine = wallFuelCorrection + graphLine = wallFuel indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {mightResetPid}, "No", "Yes" @@ -6307,39 +6296,32 @@ indicatorPanel = idle_stateIndicatorPanel, 2 indicator = {useInstantRpmForIdle}, "No", "Yes" indicator = {isVerboseIAC}, "No", "Yes" -liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = iacByTpsTaper -liveGraph = idle_state_3_Graph, "Graph", South - graphLine = throttlePedalUpState - graphLine = targetRpmByClt - graphLine = targetRpmAcBump - dialog = idle_stateDialog, "idle_state" panel = idle_stateIndicatorPanel - panel = idle_state_1_Graph - panel = idle_state_3_Graph + liveGraph = idle_state_1_Graph, "Graph", South + graphLine = idleState + graphLine = currentIdlePosition + graphLine = baseIdlePosition + graphLine = iacByTpsTaper + liveGraph = idle_state_2_Graph, "Graph", South + graphLine = throttlePedalUpState + graphLine = targetRpmByClt + graphLine = targetRpmAcBump -liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - graphLine = luaTimingMult - dialog = ignition_stateDialog, "ignition_state" - panel = ignition_state_1_Graph + liveGraph = ignition_state_1_Graph, "Graph", South + graphLine = baseDwell + graphLine = dwellVoltageCorrection + graphLine = luaTimingAdd + graphLine = luaTimingMult -liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttle_1_Graph + liveGraph = electronic_throttle_1_Graph, "Graph", South + graphLine = idlePosition + graphLine = trim + graphLine = luaAdjustment