diff --git a/firmware/console/binary/output_channels.txt b/firmware/console/binary/output_channels.txt index d746bff483..f58b1c3da6 100644 --- a/firmware/console/binary/output_channels.txt +++ b/firmware/console/binary/output_channels.txt @@ -101,14 +101,14 @@ uint16_t autoscale rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2 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 - int16_t autoscale tpsAccelFuel;@@GAUGE_NAME_FUEL_TPS_EXTRA@@;"ms",{1/@@PACK_MULT_MS@@}, 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, 0 - uint16_t autoscale sparkDwellValue;@@GAUGE_COIL_DWELL_TIME@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 0 + int16_t autoscale ignitionAdvance;@@GAUGE_NAME_TIMING_ADVANCE@@;"deg",{1/@@PACK_MULT_ANGLE@@}, 0, 0, 0, 1 + uint16_t autoscale sparkDwellValue;@@GAUGE_COIL_DWELL_TIME@@;"ms",{1/@@PACK_MULT_MS@@}, 0, 0, 0, 1 uint16_t autoscale coilDutyCycle;@@GAUGE_NAME_DWELL_DUTY@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 ! Idle & ETB - uint16_t autoscale idleAirValvePosition;@@GAUGE_NAME_IAC@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 + uint16_t autoscale idleAirValvePosition;@@GAUGE_NAME_IAC@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 1 int16_t autoscale etbTarget;ETB Target;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 2 int16_t autoscale etb1DutyCycle;@@GAUGE_NAME_ETB_DUTY@@;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 1 int16_t autoscale etb1Error;ETB Error;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 3 @@ -116,7 +116,7 @@ uint16_t autoscale rpmAcceleration;dRPM;"RPM/s",1, 0, 0, 5, 2 int16_t autoscale fuelTankLevel;Fuel level;"%",{1/@@PACK_MULT_PERCENT@@}, 0, 0, 0, 0 uint16_t autoscale totalFuelConsumption;@@GAUGE_NAME_FUEL_CONSUMPTION@@;"grams",1, 0, 0, 0, 1 - uint16_t autoscale fuelFlowRate;@@GAUGE_NAME_FUEL_FLOW@@;"gram/s",{1/@@PACK_MULT_FUEL_FLOW@@}, 0, 0, 0, 0 + uint16_t autoscale fuelFlowRate;@@GAUGE_NAME_FUEL_FLOW@@;"gram/s",{1/@@PACK_MULT_FUEL_FLOW@@}, 0, 0, 0, 3 ! Y axis values for selectable tables uint16_t autoscale veTableYAxis;;"%",{1/100}, 0, 0, 0, 0 diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 46ed630f71..4cff202bba 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -4,34 +4,71 @@ static constexpr LogField fields[] = { {packedTime, GAUGE_NAME_TIME, "sec", 0}, {engine->outputChannels.RPMValue, "RPM", "RPM", 0}, -// {engine->outputChannels.rpmAcceleration, "dRPM", "RPM/s", 2}, + {engine->outputChannels.rpmAcceleration, "dRPM", "RPM/s", 2}, {engine->outputChannels.speedToRpmRatio, "Gearbox Ratio", "value", 2}, {engine->outputChannels.vehicleSpeedKph, "Vehicle Speed", "kph", 1}, - {engine->outputChannels.totalTriggerErrorCounter, GAUGE_NAME_TRG_ERR, "err", 0}, - {engine->outputChannels.internalMcuTemperature, GAUGE_NAME_CPU_TEMP, "C", 0}, {engine->outputChannels.internalMcuTemperature, "CPU Temperature", "deg C", 0}, {engine->outputChannels.coolant, "CLT", "deg C", 1}, {engine->outputChannels.intake, "IAT", "deg C", 1}, {engine->outputChannels.auxTemp1, "auxTemp1", "deg C", 1}, {engine->outputChannels.auxTemp2, "auxTemp2", "deg C", 1}, {engine->outputChannels.TPSValue, "TPS", "%", 2}, - {engine->outputChannels.throttlePedalPosition, GAUGE_NAME_THROTTLE_PEDAL, "%", 2}, -// {engine->outputChannels.tpsADC, "tpsADC", "ADC", 0}, + {engine->outputChannels.throttlePedalPosition, "Throttle pedal position", "%", 2}, + {engine->outputChannels.tpsADC, "tpsADC", "ADC", 0}, {engine->outputChannels.rawMaf, "rawMaf", "V", 3}, {engine->outputChannels.mafMeasured, "MAF sensor", "kg/h", 1}, {engine->outputChannels.MAPValue, "MAP", "kPa", 1}, - {engine->outputChannels.lambdaValue, GAUGE_NAME_LAMBDA, "", 3}, - {engine->outputChannels.knockRetard, GAUGE_NAME_KNOCK_RETARD, "deg", 1}, - {engine->outputChannels.VBatt, GAUGE_NAME_VBAT, "v", 2}, - {engine->outputChannels.oilPressure, GAUGE_NAME_OIL_PRESSURE, GAUGE_NAME_FUEL_PRESSURE_HIGH_UNITS, 0}, - {engine->outputChannels.vvtPositionB1I, GAUGE_NAME_VVT_B1I, "deg", 1}, - {engine->outputChannels.chargeAirMass, GAUGE_NAME_AIR_MASS, "g", 3}, - {engine->outputChannels.currentTargetAfr, GAUGE_NAME_TARGET_AFR, "afr", 2}, - {engine->outputChannels.injectorDutyCycle, GAUGE_NAME_FUEL_INJ_DUTY, "%", 0}, - {engine->outputChannels.baseFuel, GAUGE_NAME_FUEL_BASE, "ms", 3}, - {engine->outputChannels.fuelRunning, GAUGE_NAME_FUEL_RUNNING, "ms", 3}, - {engine->outputChannels.actualLastInjection, GAUGE_NAME_FUEL_LAST_INJECTION, "ms", 3}, - {engine->outputChannels.veValue, GAUGE_NAME_FUEL_VE, "%", 1}, + {engine->outputChannels.baroPressure, "baroPressure", "kPa", 1}, + {engine->outputChannels.lambdaValue, "Lambda", "", 3}, + {engine->outputChannels.knockRetard, "knock: retard", "deg", 1}, + {engine->outputChannels.idleCurrentPosition, "idleCurrentPosition", "%", 1}, + {engine->outputChannels.VBatt, "VBatt", "V", 2}, + {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.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.seconds, "Uptime", "sec", 0}, + {engine->outputChannels.engineMode, "Engine Mode", "em", 0}, + {engine->outputChannels.firmwareVersion, "firmware", "version_f", 0}, + {engine->outputChannels.rawIdlePositionSensor, "rawIdlePositionSensor", "V", 3}, + {engine->outputChannels.rawWastegatePosition, "rawWastegatePosition", "V", 3}, + {engine->outputChannels.tsConfigVersion, "tsConfigVersion", "", 0}, + {engine->outputChannels.calibrationValue, "calibrationValue", "", 0}, + {engine->outputChannels.calibrationMode, "calibrationMode", "", 0}, + {engine->outputChannels.idleTargetPosition, "idleTargetPosition", "", 0}, + {engine->outputChannels.totalTriggerErrorCounter, "Trigger Error Counter", "counter", 0}, + {engine->outputChannels.orderingErrorCounter, "orderingErrorCounter", "", 0}, + {engine->outputChannels.warningCounter, "warning: counter", "count", 0}, + {engine->outputChannels.lastErrorCode, "warning: last", "error", 0}, @@ -41,10 +78,7 @@ static constexpr LogField fields[] = { {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.warningCounter, GAUGE_NAME_WARNING_COUNTER, "", 0}, - {engine->outputChannels.lastErrorCode, GAUGE_NAME_WARNING_LAST, "", 0}, {engine->outputChannels.tuneCrc16, GAUGE_NAME_TUNE_CRC16, "", 0}, - {engine->outputChannels.engineMakeCodeNameCrc16, GAUGE_NAME_ENGINE_CRC16, "", 0}, {engine->outputChannels.firmwareVersion, GAUGE_NAME_VERSION, "", 0}, {engine->outputChannels.accelerationX, GAUGE_NAME_ACCEL_X, "", 2}, @@ -77,30 +111,16 @@ static constexpr LogField fields[] = { {engine->outputChannels.wastegatePositionSensor, GAUGE_NAME_WG_POSITION, "%", 2}, {engine->outputChannels.idlePositionSensor, GAUGE_NAME_IDLE_POSITION, "%", 2}, {engine->outputChannels.targetLambda, GAUGE_NAME_TARGET_LAMBDA, "", 3}, - {engine->outputChannels.tCharge, GAUGE_NAME_TCHARGE, "C", 1}, {engine->outputChannels.injectorLagMs, GAUGE_NAME_INJECTOR_LAG, "ms", 3}, {engine->outputChannels.fuelPidCorrection[0], GAUGE_NAME_FUEL_TRIM, "%", 2}, {engine->outputChannels.fuelPidCorrection[1], GAUGE_NAME_FUEL_TRIM_2, "%", 2}, - {engine->outputChannels.wallFuelCorrection, GAUGE_NAME_FUEL_WALL_CORRECTION, "mg", 3}, - {engine->outputChannels.wallFuelAmount, GAUGE_NAME_FUEL_WALL_AMOUNT, "mg", 3}, - {engine->outputChannels.tpsAccelFuel, GAUGE_NAME_FUEL_TPS_EXTRA, "ms", 3}, {engine->outputChannels.ignitionAdvance, GAUGE_NAME_TIMING_ADVANCE, "deg", 1}, - {engine->outputChannels.sparkDwellValue, GAUGE_COIL_DWELL_TIME, "ms", 1}, - {engine->outputChannels.coilDutyCycle, GAUGE_NAME_DWELL_DUTY, "%", 0}, - {engine->outputChannels.idleAirValvePosition, GAUGE_NAME_IAC, "%", 1}, - {engine->outputChannels.etbTarget, GAUGE_NAME_ETB_TARGET, "%", 2}, - {engine->outputChannels.etb1DutyCycle, GAUGE_NAME_ETB_DUTY, "%", 1}, - {engine->outputChannels.etb1Error, GAUGE_NAME_ETB_ERROR, "%", 3}, - {engine->outputChannels.fuelTankLevel, GAUGE_NAME_FUEL_LEVEL, "%", 0}, // {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.fuelFlowRate, GAUGE_NAME_FUEL_FLOW, "g/s", 3}, - {engine->outputChannels.totalFuelConsumption, GAUGE_NAME_FUEL_CONSUMPTION, "g", 1}, - {engine->outputChannels.knockLevel, GAUGE_NAME_KNOCK_LEVEL, "dBv", 0}, {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},