SD card log fields list should be auto-generated #3985

This commit is contained in:
rusefillc 2022-10-10 22:58:03 -04:00
parent 210c878493
commit 7b830447ae
2 changed files with 28 additions and 26 deletions

View File

@ -100,7 +100,7 @@ uint16_t autoscale rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2
uint16_t autoscale revolutionCounterSinceStart;;"",1, 0, 0, 0, 0
int16_t autoscale deltaTps;@@GAUGE_NAME_FUEL_TPS_ROC@@;"ratio",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0
uint16_t canReadCounter;;"",1, 0, 0, 0, 0
uint16_t autoscale canReadCounter;;"",1, 0, 0, 0, 0
int16_t autoscale tpsAccelFuel;@@GAUGE_NAME_FUEL_TPS_EXTRA@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 3
! Ignition
int16_t autoscale ignitionAdvance;@@GAUGE_NAME_TIMING_ADVANCE@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1
@ -153,7 +153,7 @@ uint16_t autoscale rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2
! Errors
uint32_t autoscale totalTriggerErrorCounter;@@GAUGE_NAME_TRG_ERR@@;"counter",1, 0, 0, 0, 0
uint32_t orderingErrorCounter;;"",1, 0, 0, 0, 0
uint32_t autoscale orderingErrorCounter;;"",1, 0, 0, 0, 0
uint16_t autoscale warningCounter;@@GAUGE_NAME_WARNING_COUNTER@@;"count",1, 0, 0, 0, 0
uint16_t autoscale lastErrorCode;@@GAUGE_NAME_WARNING_LAST@@;"error",1, 0, 0, 0, 0

View File

@ -69,36 +69,41 @@ 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},
{engine->outputChannels.debugFloatField4, "debugFloatField4", "val", 3},
{engine->outputChannels.debugFloatField5, "debugFloatField5", "val", 3},
{engine->outputChannels.debugFloatField6, "debugFloatField6", "val", 3},
{engine->outputChannels.debugFloatField7, "debugFloatField7", "val", 3},
{engine->outputChannels.debugIntField1, "debugIntField1", "val", 0},
{engine->outputChannels.debugIntField2, "debugIntField2", "val", 0},
{engine->outputChannels.debugIntField3, "debugIntField3", "val", 0},
{engine->outputChannels.debugIntField4, "debugIntField4", "val", 0},
{engine->outputChannels.debugIntField5, "debugIntField5", "val", 0},
{engine->outputChannels.accelerationX, "Acceleration: X", "G", 2},
{engine->outputChannels.accelerationY, "Acceleration: Y", "G", 2},
{engine->outputChannels.TPS2Value, GAUGE_NAME_TPS2, "%", 2},
{engine->outputChannels.rawTps1Primary, "rawTps1Primary", "V", 3},
{engine->outputChannels.rawPpsPrimary, "rawPpsPrimary", "V", 3},
{engine->outputChannels.rawClt, "rawClt", "V", 3},
{engine->outputChannels.rawIat, "rawIat", "V", 3},
{engine->outputChannels.rawOilPressure, "rawOilPressure", "V", 3},
{engine->outputChannels.tuneCrc16, GAUGE_NAME_TUNE_CRC16, "", 0},
{engine->outputChannels.fuelClosedLoopBinIdx, "fuelClosedLoopBinIdx", "", 0},
{engine->outputChannels.tcuCurrentGear, "Current Gear", "gear", 0},
{engine->outputChannels.rawPpsSecondary, "rawPpsSecondary", "V", 3},
{engine->outputChannels.tcuDesiredGear, "Desired Gear", "gear", 0},
{engine->outputChannels.flexPercent, "Flex Ethanol %", "%", 0},
{engine->outputChannels.AFRValue, GAUGE_NAME_AFR, "afr", 2},
{engine->outputChannels.AFRValue2, GAUGE_NAME_AFR2, "afr", 2},
{engine->outputChannels.lambdaValue2, GAUGE_NAME_LAMBDA2, "", 3},
{engine->outputChannels.tuneCrc16, GAUGE_NAME_TUNE_CRC16, "", 0},
{engine->outputChannels.firmwareVersion, GAUGE_NAME_VERSION, "", 0},
{engine->outputChannels.accelerationX, GAUGE_NAME_ACCEL_X, "", 2},
{engine->outputChannels.accelerationY, GAUGE_NAME_ACCEL_Y, "", 2},
{engine->outputChannels.accelerationZ, GAUGE_NAME_ACCEL_Z, "", 2},
{engine->outputChannels.accelerationRoll, GAUGE_NAME_ACCEL_ROLL, "", 2},
{engine->outputChannels.accelerationYaw, GAUGE_NAME_ACCEL_YAW, "", 2},
{engine->outputChannels.debugIntField1, GAUGE_NAME_DEBUG_I1, "", 0},
{engine->outputChannels.debugIntField2, GAUGE_NAME_DEBUG_I2, "", 0},
{engine->outputChannels.debugIntField3, GAUGE_NAME_DEBUG_I3, "", 0},
{engine->outputChannels.debugIntField4, GAUGE_NAME_DEBUG_I4, "", 0},
{engine->outputChannels.debugIntField5, GAUGE_NAME_DEBUG_I5, "", 0},
{engine->outputChannels.debugFloatField1, GAUGE_NAME_DEBUG_F1, "", 3},
{engine->outputChannels.debugFloatField2, GAUGE_NAME_DEBUG_F2, "", 3},
{engine->outputChannels.debugFloatField3, GAUGE_NAME_DEBUG_F3, "", 3},
{engine->outputChannels.debugFloatField4, GAUGE_NAME_DEBUG_F4, "", 3},
{engine->outputChannels.debugFloatField5, GAUGE_NAME_DEBUG_F5, "", 3},
{engine->outputChannels.debugFloatField6, GAUGE_NAME_DEBUG_F6, "", 3},
{engine->outputChannels.debugFloatField7, GAUGE_NAME_DEBUG_F7, "", 3},
{engine->outputChannels.lowFuelPressure, GAUGE_NAME_FUEL_PRESSURE_LOW, GAUGE_NAME_FUEL_PRESSURE_LOW_UNITS, 0},
{engine->outputChannels.highFuelPressure, GAUGE_NAME_FUEL_PRESSURE_HIGH, GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS, 0},
{engine->outputChannels.vvtPositionB1E, GAUGE_NAME_VVT_B1E, "deg", 1},
@ -118,9 +123,6 @@ static constexpr LogField fields[] = {
// {engine->outputChannels.fuelingLoad, GAUGE_NAME_FUEL_LOAD, "%", 1},
// {engine->outputChannels.ignitionLoad, GAUGE_NAME_IGNITION_LOAD, "%", 1},
{engine->outputChannels.mafEstimate, GAUGE_NAME_AIR_FLOW_ESTIMATE, "kg/h", 1},
{engine->outputChannels.tcuDesiredGear, GAUGE_NAME_DESIRED_GEAR, "gear", 0},
{engine->outputChannels.tcuCurrentGear, GAUGE_NAME_CURRENT_GEAR, "gear", 0},
{engine->outputChannels.flexPercent, GAUGE_NAME_FLEX, "%", 1},
{engine->outputChannels.knock[0], GAUGE_NAME_KNOCK_1, "dBv", 0},
{engine->outputChannels.knock[1], GAUGE_NAME_KNOCK_2, "dBv", 0},
{engine->outputChannels.knock[2], GAUGE_NAME_KNOCK_3, "dBv", 0},