diff --git a/firmware/console/binary/generated/gauges.ini b/firmware/console/binary/generated/gauges.ini index 40aca1a0a4..234af5e741 100644 --- a/firmware/console/binary/generated/gauges.ini +++ b/firmware/console/binary/generated/gauges.ini @@ -47,25 +47,25 @@ mafMeasuredGauge = mafMeasured,"MAF sensor", "kg/h", 0.0,0.0, 0.0,0.0, 0.0,0.0, MAPValueGauge = MAPValue,"MAP", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 baroPressureGauge = baroPressure,"baroPressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 lambdaValueGauge = lambdaValue,"Lambda", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 -knockRetardGauge = knockRetard,"knock: retard", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +knockRetardGauge = knockRetard,"knock: retard", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 idleCurrentPositionGauge = idleCurrentPosition,"idleCurrentPosition", "%", 0.0,100.0, 0.0,100.0, 0.0,100.0, 1,1 VBattGauge = VBatt,"VBatt", "V", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2 oilPressureGauge = oilPressure,"Oil Pressure", "kPa", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 vvtPositionB1IGauge = vvtPositionB1I,"VVT: bank 1 intake", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 -chargeAirMassGauge = chargeAirMass,"air mass", "g", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +chargeAirMassGauge = chargeAirMass,"air mass", "g", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 crankingFuelMsGauge = crankingFuelMs,"crankingFuelMs", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -currentTargetAfrGauge = currentTargetAfr,"fuel: target AFR", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -baseFuelGauge = baseFuel,"fuel: base mass", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -fuelRunningGauge = fuelRunning,"fuel: running", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -actualLastInjectionGauge = actualLastInjection,"fuel: Last injection", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +currentTargetAfrGauge = currentTargetAfr,"fuel: target AFR", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2 +baseFuelGauge = baseFuel,"fuel: base mass", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 +fuelRunningGauge = fuelRunning,"fuel: running", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 +actualLastInjectionGauge = actualLastInjection,"fuel: Last injection", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 injectorDutyCycleGauge = injectorDutyCycle,"fuel: injector duty cycle", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -veValueGauge = veValue,"fuel: VE", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +veValueGauge = veValue,"fuel: VE", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 injectionOffsetGauge = injectionOffset,"injectionOffset", "deg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -tChargeGauge = tCharge,"tCharge", "deg C", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -injectorLagMsGauge = injectorLagMs,"fuel: injector lag", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +tChargeGauge = tCharge,"tCharge", "deg C", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 +injectorLagMsGauge = injectorLagMs,"fuel: injector lag", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 engineMakeCodeNameCrc16Gauge = engineMakeCodeNameCrc16,"Engine CRC16", "crc16", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -wallFuelAmountGauge = wallFuelAmount,"fuel: wall amount", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -wallFuelCorrectionGauge = wallFuelCorrection,"fuel: wall correction", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +wallFuelAmountGauge = wallFuelAmount,"fuel: wall amount", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 +wallFuelCorrectionGauge = wallFuelCorrection,"fuel: wall correction", "mg", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 revolutionCounterSinceStartGauge = revolutionCounterSinceStart,"revolutionCounterSinceStart", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 deltaTpsGauge = deltaTps,"fuel: TPS change", "ratio", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 canReadCounterGauge = canReadCounter,"canReadCounter", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -74,11 +74,11 @@ ignitionAdvanceGauge = ignitionAdvance,"timing", "deg", 0.0,0.0, 0.0,0.0, 0.0,0. sparkDwellValueGauge = sparkDwellValue,"dwell: coil charge time", "ms", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 coilDutyCycleGauge = coilDutyCycle,"dwell: coil duty cycle", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 idleAirValvePositionGauge = idleAirValvePosition,"Idle Air Valve", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -etbTargetGauge = etbTarget,"ETB Target", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -etb1DutyCycleGauge = etb1DutyCycle,"ETB Duty", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -etb1ErrorGauge = etb1Error,"ETB Error", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +etbTargetGauge = etbTarget,"ETB Target", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2 +etb1DutyCycleGauge = etb1DutyCycle,"ETB Duty", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 +etb1ErrorGauge = etb1Error,"ETB Error", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 3,3 fuelTankLevelGauge = fuelTankLevel,"Fuel level", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -totalFuelConsumptionGauge = totalFuelConsumption,"fuel: Total consumed", "grams", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +totalFuelConsumptionGauge = totalFuelConsumption,"fuel: Total consumed", "grams", 0.0,0.0, 0.0,0.0, 0.0,0.0, 1,1 fuelFlowRateGauge = fuelFlowRate,"fuel: Flow rate", "gram/s", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 veTableYAxisGauge = veTableYAxis,"veTableYAxis", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 afrTableYAxisGauge = afrTableYAxis,"afrTableYAxis", "%", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 @@ -235,8 +235,8 @@ tcRatioGauge = tcRatio,"Torque Converter Ratio", "value", 0.0,0.0, 0.0,0.0, 0.0, lastShiftTimeGauge = lastShiftTime,"lastShiftTime", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 vssEdgeCounterGauge = vssEdgeCounter,"vssEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 issEdgeCounterGauge = issEdgeCounter,"issEdgeCounter", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 -auxLinear1Gauge = auxLinear1,"Aux Linear 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 -auxLinear2Gauge = auxLinear2,"Aux Linear 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 0,0 +auxLinear1Gauge = auxLinear1,"Aux Linear 1", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2 +auxLinear2Gauge = auxLinear2,"Aux Linear 2", "", 0.0,0.0, 0.0,0.0, 0.0,0.0, 2,2 dfcoActiveGauge = dfcoActive,"dfcoActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 tpsAccelActiveGauge = tpsAccelActive,"tpsAccelActive", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 unusedBit_212_2Gauge = unusedBit_212_2,"unusedBit_212_2", "", -1.0,-1.0, -1.0,-1.0, -1.0,-1.0, -1,-1 diff --git a/firmware/console/binary/output_channels_generated.h b/firmware/console/binary/output_channels_generated.h index 07d65208ff..1b773709a0 100644 --- a/firmware/console/binary/output_channels_generated.h +++ b/firmware/console/binary/output_channels_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Oct 09 21:43:44 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Oct 11 01:55:05 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -142,7 +142,7 @@ struct output_channels_s { RPM/s * offset 6 */ - uint16_t rpmAcceleration = (uint16_t)0; + scaled_channel rpmAcceleration = (uint16_t)0; /** * @@GAUGE_NAME_GEAR_RATIO@@ value @@ -199,7 +199,7 @@ struct output_channels_s { ADC * offset 24 */ - uint16_t tpsADC = (uint16_t)0; + scaled_channel tpsADC = (uint16_t)0; /** V * offset 26 @@ -1417,4 +1417,4 @@ struct output_channels_s { static_assert(sizeof(output_channels_s) == 756); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Sun Oct 09 21:43:44 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Tue Oct 11 01:55:05 UTC 2022 diff --git a/firmware/console/binary_log/sd_fields.h b/firmware/console/binary_log/sd_fields.h index 3804480fa4..2715cf9a55 100644 --- a/firmware/console/binary_log/sd_fields.h +++ b/firmware/console/binary_log/sd_fields.h @@ -16,25 +16,25 @@ static constexpr LogField fields[] = { {engine->outputChannels.MAPValue, "MAP", "kPa", 1}, {engine->outputChannels.baroPressure, "baroPressure", "kPa", 1}, {engine->outputChannels.lambdaValue, "Lambda", "", 3}, - {engine->outputChannels.knockRetard, "knock: retard", "deg", 0}, + {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", 0}, + {engine->outputChannels.chargeAirMass, "air mass", "g", 3}, {engine->outputChannels.crankingFuelMs, "crankingFuelMs", "ms", 0}, - {engine->outputChannels.currentTargetAfr, "fuel: target AFR", "ratio", 0}, - {engine->outputChannels.baseFuel, "fuel: base mass", "mg", 0}, - {engine->outputChannels.fuelRunning, "fuel: running", "mg", 0}, - {engine->outputChannels.actualLastInjection, "fuel: Last injection", "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", 0}, + {engine->outputChannels.veValue, "fuel: VE", "ratio", 1}, {engine->outputChannels.injectionOffset, "injectionOffset", "deg", 0}, - {engine->outputChannels.tCharge, "tCharge", "deg C", 0}, - {engine->outputChannels.injectorLagMs, "fuel: injector lag", "ms", 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", 0}, - {engine->outputChannels.wallFuelCorrection, "fuel: wall correction", "mg", 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}, @@ -43,11 +43,11 @@ static constexpr LogField fields[] = { {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", "%", 0}, - {engine->outputChannels.etb1DutyCycle, "ETB Duty", "%", 0}, - {engine->outputChannels.etb1Error, "ETB Error", "%", 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", 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}, @@ -169,8 +169,8 @@ static constexpr LogField fields[] = { {engine->outputChannels.lastShiftTime, "lastShiftTime", "", -1}, {engine->outputChannels.vssEdgeCounter, "vssEdgeCounter", "", -1}, {engine->outputChannels.issEdgeCounter, "issEdgeCounter", "", -1}, - {engine->outputChannels.auxLinear1, "Aux Linear 1", "", 0}, - {engine->outputChannels.auxLinear2, "Aux Linear 2", "", 0}, + {engine->outputChannels.auxLinear1, "Aux Linear 1", "", 2}, + {engine->outputChannels.auxLinear2, "Aux Linear 2", "", 2}, {engine->outputChannels.boostControllerOutput, "Boost Output", "%", 1}, {engine->outputChannels.boostControllerOpenLoopPart, "Boost Open Loop", "%", 1}, {engine->outputChannels.fallbackMap, "fallbackMap", "kPa", 1},