From 9b6a3cf6a6e3e2f163831fdac85f9a5254aadd93 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Tue, 11 Oct 2022 23:43:45 -0400 Subject: [PATCH] SD card log fields list should be auto-generated #3985 --- .../console/binary_log/log_fields_generated.h | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 4024d96a7c..a3f075f8c8 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -26,36 +26,36 @@ static constexpr LogField fields[] = { {engine->outputChannels.oilPressure, "Oil Pressure", "kPa", 0}, {engine->outputChannels.vvtPositionB1I, "VVT: bank 1 intake", "deg", 1}, {engine->outputChannels.chargeAirMass, "air mass", "g", 3}, - {engine->outputChannels.crankingFuelMs, "crankingFuelMs", "ms", 0}, + {engine->outputChannels.crankingFuelMs, "crankingFuelMs", "ms", 2}, {engine->outputChannels.currentTargetAfr, "fuel: target AFR", "ratio", 2}, {engine->outputChannels.baseFuel, "fuel: base mass", "mg", 3}, {engine->outputChannels.fuelRunning, "fuel: running", "mg", 3}, {engine->outputChannels.actualLastInjection, "fuel: Last injection", "ms", 3}, {engine->outputChannels.injectorDutyCycle, "fuel: injector duty cycle", "%", 0}, {engine->outputChannels.veValue, "fuel: VE", "ratio", 1}, -// {engine->outputChannels.injectionOffset, "injectionOffset", "deg", 0}, -// {engine->outputChannels.tCharge, "tCharge", "deg C", 1}, -// {engine->outputChannels.injectorLagMs, "fuel: injector lag", "ms", 3}, -// {engine->outputChannels.engineMakeCodeNameCrc16, "Engine CRC16", "crc16", 0}, -// {engine->outputChannels.wallFuelAmount, "fuel: wall amount", "mg", 3}, -// {engine->outputChannels.wallFuelCorrection, "fuel: wall correction", "mg", 3}, -// {engine->outputChannels.revolutionCounterSinceStart, "revolutionCounterSinceStart", "", 0}, -// {engine->outputChannels.deltaTps, "fuel: TPS change", "ratio", 0}, -// {engine->outputChannels.canReadCounter, "canReadCounter", "", 0}, -// {engine->outputChannels.tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", "ms", 3}, -// {engine->outputChannels.ignitionAdvance, "timing", "deg", 0}, -// {engine->outputChannels.sparkDwellValue, "dwell: coil charge time", "ms", 0}, -// {engine->outputChannels.coilDutyCycle, "dwell: coil duty cycle", "%", 0}, -// {engine->outputChannels.idleAirValvePosition, "Idle Air Valve", "%", 0}, -// {engine->outputChannels.etbTarget, "ETB Target", "%", 2}, -// {engine->outputChannels.etb1DutyCycle, "ETB Duty", "%", 1}, -// {engine->outputChannels.etb1Error, "ETB Error", "%", 3}, -// {engine->outputChannels.fuelTankLevel, "Fuel level", "%", 0}, -// {engine->outputChannels.totalFuelConsumption, "fuel: Total consumed", "grams", 1}, -// {engine->outputChannels.fuelFlowRate, "fuel: Flow rate", "gram/s", 0}, -// {engine->outputChannels.veTableYAxis, "veTableYAxis", "%", 0}, -// {engine->outputChannels.afrTableYAxis, "afrTableYAxis", "%", 0}, - {engine->outputChannels.knockLevel, "knock: current level", "Volts", 0}, + {engine->outputChannels.injectionOffset, "injectionOffset", "deg", 0}, + {engine->outputChannels.tCharge, "tCharge", "deg C", 1}, + {engine->outputChannels.injectorLagMs, "fuel: injector lag", "ms", 3}, + {engine->outputChannels.engineMakeCodeNameCrc16, "Engine CRC16", "crc16", 0}, + {engine->outputChannels.wallFuelAmount, "fuel: wall amount", "mg", 3}, + {engine->outputChannels.wallFuelCorrection, "fuel: wall correction", "mg", 3}, + {engine->outputChannels.revolutionCounterSinceStart, "revolutionCounterSinceStart", "", 0}, + {engine->outputChannels.deltaTps, "fuel: TPS change", "ratio", 0}, + {engine->outputChannels.canReadCounter, "canReadCounter", "", 0}, + {engine->outputChannels.tpsAccelFuel, "fuel: TPS acceleration extra fuel ms", "ms", 3}, + {engine->outputChannels.ignitionAdvance, "timing", "deg", 1}, + {engine->outputChannels.sparkDwellValue, "dwell: coil charge time", "ms", 1}, + {engine->outputChannels.coilDutyCycle, "dwell: coil duty cycle", "%", 0}, + {engine->outputChannels.idleAirValvePosition, "Idle Air Valve", "%", 1}, + {engine->outputChannels.etbTarget, "ETB Target", "%", 2}, + {engine->outputChannels.etb1DutyCycle, "ETB Duty", "%", 1}, + {engine->outputChannels.etb1Error, "ETB Error", "%", 3}, + {engine->outputChannels.fuelTankLevel, "Fuel level", "%", 0}, + {engine->outputChannels.totalFuelConsumption, "fuel: Total consumed", "grams", 1}, + {engine->outputChannels.fuelFlowRate, "fuel: Flow rate", "gram/s", 3}, + {engine->outputChannels.veTableYAxis, "veTableYAxis", "%", 0}, + {engine->outputChannels.afrTableYAxis, "afrTableYAxis", "%", 0}, + {engine->outputChannels.knockLevel, "knock: current level", "Volts", 2}, {engine->outputChannels.seconds, "Uptime", "sec", 0}, {engine->outputChannels.engineMode, "Engine Mode", "em", 0}, {engine->outputChannels.firmwareVersion, "firmware", "version_f", 0}, @@ -69,6 +69,8 @@ static constexpr LogField fields[] = { {engine->outputChannels.orderingErrorCounter, "orderingErrorCounter", "", 0}, {engine->outputChannels.warningCounter, "warning: counter", "count", 0}, {engine->outputChannels.lastErrorCode, "warning: last", "error", 0}, + + {engine->outputChannels.debugFloatField1, "debugFloatField1", "val", 3}, {engine->outputChannels.debugFloatField2, "debugFloatField2", "val", 3}, {engine->outputChannels.debugFloatField3, "debugFloatField3", "val", 3},