diff --git a/firmware/console/binary/generated/wip.ini b/firmware/console/binary/generated/wip.ini new file mode 100644 index 0000000000..b3a2575f6c --- /dev/null +++ b/firmware/console/binary/generated/wip.ini @@ -0,0 +1,385 @@ +RPMValue("RPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 4, 1.0, 0.0, 8000.0, "RPM"), +rpmAcceleration("dRPM", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 6, 1.0, 0.0, 5.0, "RPM/s"), +speedToRpmRatio("Gearbox Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 8, 0.01, 0.0, 0.0, "value"), +vehicleSpeedKph("Vehicle Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 10, 1.0, 0.0, 0.0, "kph"), +internalMcuTemperature("CPU Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 11, 1.0, 0.0, 0.0, "deg C"), +coolant("CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 12, 0.01, 0.0, 0.0, "deg C"), +intake("IAT", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 14, 0.01, 0.0, 0.0, "deg C"), +auxTemp1("auxTemp1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 16, 0.01, 0.0, 0.0, "deg C"), +auxTemp2("auxTemp2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 18, 0.01, 0.0, 0.0, "deg C"), +TPSValue("TPS", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 20, 0.01, 0.0, 0.0, "%"), +throttlePedalPosition("Throttle pedal position", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 22, 0.01, 0.0, 0.0, "%"), +tpsADC("tpsADC", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 24, 1.0, 0.0, 0.0, "ADC"), +rawMaf("rawMaf", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 26, 0.001, 0.0, 5.0, "V"), +mafMeasured("MAF sensor", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 28, 0.1, 0.0, 0.0, "kg/h"), +MAPValue("MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 30, 0.03333333333333333, 0.0, 0.0, "kPa"), +baroPressure("baroPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 32, 0.03333333333333333, 0.0, 0.0, "kPa"), +lambdaValue("Lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 34, 1.0E-4, 0.0, 0.0, ""), +knockRetard("knockRetard", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 36, 0.1, 0.0, 0.0, "deg"), +idleCurrentPosition("idleCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 37, 0.5, 0.0, 100.0, "%"), +VBatt("VBatt", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 38, 0.001, 0.0, 0.0, "V"), +oilPressure("Oil Pressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 40, 0.03333333333333333, 0.0, 0.0, "kPa"), +vvtPositionB1I("VVT: bank 1 intake", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 42, 0.02, 0.0, 0.0, "deg"), +chargeAirMass("air mass", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 44, 0.001, 0.0, 0.0, "g"), +crankingFuelMs("crankingFuelMs\nairmass in mg, 0-65 grams", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 46, 0.01, 0.0, 0.0, "ms"), +currentTargetAfr("fuel: target AFR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 48, 0.001, 0.0, 0.0, "ratio"), +baseFuel("fuel: base mass"\nThis is the raw value we take from the fuel map or base fuel algorithm, before the corrections, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 50, 0.01, 0.0, 0.0, "mg"), +fuelRunning("fuel: running"\nTotal fuel with CLT IAT and TPS acceleration without injector lag corrections per cycle, as pulse per cycle, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 52, 0.01, 0.0, 0.0, "mg"), +actualLastInjection("fuel: Last injection"\nActual last injection time - including all compensation and injection mode, SensorCategory.SENSOR_INPUTS, FieldType.INT16, 54, 0.0033333333333333335, 0.0, 0.0, "ms"), +injectorDutyCycle("fuel: injector duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 56, 0.5, 0.0, 0.0, "%"), +veValue("fuel: VE", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 57, 0.5, 0.0, 0.0, "ratio"), +injectionOffset("injectionOffset", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 58, 1.0, 0.0, 0.0, "deg"), +tCharge("tCharge", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 60, 0.01, 0.0, 0.0, "deg C"), +injectorLagMs("fuel: injector lag", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 62, 0.0033333333333333335, 0.0, 0.0, "ms"), +iatCorrection("fuel: IAT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 64, 0.01, 0.0, 0.0, "%"), +cltCorrection("fuel: CLT correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 66, 0.01, 0.0, 0.0, "%"), +baroCorrection("fuel: Barometric pressure correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 68, 0.01, 0.0, 0.0, "%"), +currentEnginePhase("Engine Phase", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 70, 1.0, 0.0, 0.0, "deg"), +wallFuelAmount("fuel: wall amount", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 72, 0.01, 0.0, 0.0, "mg"), +wallFuelCorrection("fuel: wall correction", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 74, 0.01, 0.0, 0.0, "mg"), +revolutionCounterSinceStart("revolutionCounterSinceStart", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 76, 1.0, 0.0, 0.0, ""), +deltaTps("fuel: TPS change", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 78, 0.01, 0.0, 0.0, "ratio"), +canReadCounter("canReadCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 80, 1.0, 0.0, 0.0, ""), +tpsAccelFuel("fuel: TPS acceleration extra fuel ms", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 82, 0.0033333333333333335, 0.0, 0.0, "ms"), +ignitionAdvance("timing", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 84, 0.02, 0.0, 0.0, "deg"), +sparkDwellValue("dwell: coil charge time", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 86, 0.0033333333333333335, 0.0, 0.0, "ms"), +coilDutyCycle("dwell: coil duty cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 88, 0.01, 0.0, 0.0, "%"), +idleAirValvePosition("Idle Air Valve", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 90, 0.01, 0.0, 0.0, "%"), +etbTarget("ETB Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 92, 0.01, 0.0, 0.0, "%"), +etb1DutyCycle("ETB Duty", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 94, 0.01, 0.0, 0.0, "%"), +etb1Error("ETB Error", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 96, 0.01, 0.0, 0.0, "%"), +fuelTankLevel("Fuel level", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 98, 0.01, 0.0, 0.0, "%"), +totalFuelConsumption("fuel: Total consumed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 100, 1.0, 0.0, 0.0, "grams"), +fuelFlowRate("fuel: Flow rate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 102, 0.005, 0.0, 0.0, "gram/s"), +veTableYAxis("veTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 104, 0.01, 0.0, 0.0, "%"), +afrTableYAxis("afrTableYAxis", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 106, 0.01, 0.0, 0.0, "%"), +knockLevel("knock: current level", SensorCategory.SENSOR_INPUTS, FieldType.INT, 108, 1.0, 0.0, 0.0, "Volts"), +seconds("Uptime", SensorCategory.SENSOR_INPUTS, FieldType.INT, 112, 1.0, 0.0, 0.0, "sec"), +engineMode("Engine Mode", SensorCategory.SENSOR_INPUTS, FieldType.INT, 116, 1.0, 0.0, 0.0, "em"), +firmwareVersion("firmware", SensorCategory.SENSOR_INPUTS, FieldType.INT, 120, 1.0, 0.0, 0.0, "version_f"), +tsConfigVersion("tsConfigVersion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 124, 1.0, 0.0, 0.0, ""), +calibrationValue("calibrationValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 128, 1.0, 0.0, 0.0, ""), +calibrationMode("calibrationMode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 132, 1.0, 0.0, 0.0, ""), +idleTargetPosition("idleTargetPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 133, 1.0, 0.0, 0.0, ""), +fuelingLoad("fuel: load", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 134, 0.01, 0.0, 0.0, "%"), +ignitionLoad("ign: load", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 136, 0.01, 0.0, 0.0, "%"), +engineMakeCodeNameCrc16("Engine CRC16", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 138, 1.0, 0.0, 0.0, "crc16"), +totalTriggerErrorCounter("Trigger Error Counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 140, 1.0, 0.0, 0.0, "counter"), +orderingErrorCounter("orderingErrorCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 144, 1.0, 0.0, 0.0, ""), +warningCounter("warning: counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 148, 1.0, 0.0, 0.0, "count"), +lastErrorCode("warning: last", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 150, 1.0, 0.0, 0.0, "error"), +recentErrorCode1("recentErrorCode1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 152, 1.0, 0.0, 0.0, "error"), +recentErrorCode2("recentErrorCode2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 154, 1.0, 0.0, 0.0, "error"), +recentErrorCode3("recentErrorCode3", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 156, 1.0, 0.0, 0.0, "error"), +recentErrorCode4("recentErrorCode4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 158, 1.0, 0.0, 0.0, "error"), +recentErrorCode5("recentErrorCode5", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 160, 1.0, 0.0, 0.0, "error"), +recentErrorCode6("recentErrorCode6", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 162, 1.0, 0.0, 0.0, "error"), +recentErrorCode7("recentErrorCode7", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 164, 1.0, 0.0, 0.0, "error"), +recentErrorCode8("recentErrorCode8", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 166, 1.0, 0.0, 0.0, "error"), +debugFloatField1("debugFloatField1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 168, 1.0, 0.0, 0.0, "val"), +debugFloatField2("debugFloatField2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 172, 1.0, 0.0, 0.0, "val"), +debugFloatField3("debugFloatField3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 176, 1.0, 0.0, 0.0, "val"), +debugFloatField4("debugFloatField4", SensorCategory.SENSOR_INPUTS, FieldType.INT, 180, 1.0, 0.0, 0.0, "val"), +debugFloatField5("debugFloatField5", SensorCategory.SENSOR_INPUTS, FieldType.INT, 184, 1.0, 0.0, 0.0, "val"), +debugFloatField6("debugFloatField6", SensorCategory.SENSOR_INPUTS, FieldType.INT, 188, 1.0, 0.0, 0.0, "val"), +debugFloatField7("debugFloatField7", SensorCategory.SENSOR_INPUTS, FieldType.INT, 192, 1.0, 0.0, 0.0, "val"), +debugIntField1("debugIntField1", SensorCategory.SENSOR_INPUTS, FieldType.INT, 196, 1.0, 0.0, 0.0, "val"), +debugIntField2("debugIntField2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 200, 1.0, 0.0, 0.0, "val"), +debugIntField3("debugIntField3", SensorCategory.SENSOR_INPUTS, FieldType.INT, 204, 1.0, 0.0, 0.0, "val"), +debugIntField4("debugIntField4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 208, 1.0, 0.0, 0.0, "val"), +debugIntField5("debugIntField5", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 210, 1.0, 0.0, 0.0, "val"), +accelerationX("Acceleration: X", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 212, 0.01, 0.0, 0.0, "G"), +accelerationY("Acceleration: Y", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 214, 0.01, 0.0, 0.0, "G"), +egt1("egt1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 216, 1.0, 0.0, 0.0, "deg C"), +egt2("egt2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 218, 1.0, 0.0, 0.0, "deg C"), +egt3("egt3", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 220, 1.0, 0.0, 0.0, "deg C"), +egt4("egt4", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 222, 1.0, 0.0, 0.0, "deg C"), +egt5("egt5", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 224, 1.0, 0.0, 0.0, "deg C"), +egt6("egt6", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 226, 1.0, 0.0, 0.0, "deg C"), +egt7("egt7", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 228, 1.0, 0.0, 0.0, "deg C"), +egt8("egt8", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 230, 1.0, 0.0, 0.0, "deg C"), +TPS2Value("TPS2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 232, 0.01, 0.0, 0.0, "%"), +rawTps1Primary("rawTps1Primary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 234, 0.001, 0.0, 5.0, "V"), +rawPpsPrimary("rawPpsPrimary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 236, 0.001, 0.0, 5.0, "V"), +rawClt("rawClt", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 238, 0.001, 0.0, 5.0, "V"), +rawIat("rawIat", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 240, 0.001, 0.0, 5.0, "V"), +rawOilPressure("rawOilPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 242, 0.001, 0.0, 5.0, "V"), +tuneCrc16("Tune CRC16", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 244, 1.0, 0.0, 0.0, "crc16"), +fuelClosedLoopBinIdx("fuelClosedLoopBinIdx", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 246, 1.0, 0.0, 0.0, ""), +tcuCurrentGear("Current Gear", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 247, 1.0, 0.0, 0.0, "gear"), +rawPpsSecondary("rawPpsSecondary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 248, 0.001, 0.0, 5.0, "V"), +knock1("knock1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 250, 1.0, 0.0, 0.0, "dBv"), +knock2("knock2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 251, 1.0, 0.0, 0.0, "dBv"), +knock3("knock3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 252, 1.0, 0.0, 0.0, "dBv"), +knock4("knock4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 253, 1.0, 0.0, 0.0, "dBv"), +knock5("knock5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 254, 1.0, 0.0, 0.0, "dBv"), +knock6("knock6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 255, 1.0, 0.0, 0.0, "dBv"), +knock7("knock7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 256, 1.0, 0.0, 0.0, "dBv"), +knock8("knock8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 257, 1.0, 0.0, 0.0, "dBv"), +knock9("knock9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 258, 1.0, 0.0, 0.0, "dBv"), +knock10("knock10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 259, 1.0, 0.0, 0.0, "dBv"), +knock11("knock11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 260, 1.0, 0.0, 0.0, "dBv"), +knock12("knock12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 261, 1.0, 0.0, 0.0, "dBv"), +tcuDesiredGear("Desired Gear", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 262, 1.0, 0.0, 0.0, "gear"), +flexPercent("Flex Ethanol %", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 263, 0.5, 0.0, 0.0, "%"), +rawIdlePositionSensor("rawIdlePositionSensor", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 264, 0.001, 0.0, 5.0, "V"), +rawWastegatePosition("rawWastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 266, 0.001, 0.0, 5.0, "V"), +wastegatePositionSensor("Wastegate position sensor", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 268, 0.01, 0.0, 0.0, "%"), +idlePositionSensor("Idle position sensor", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 270, 0.01, 0.0, 0.0, "%"), +rawLowFuelPressure("rawLowFuelPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 272, 0.001, 0.0, 5.0, "V"), +rawHighFuelPressure("rawHighFuelPressure", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 274, 0.001, 0.0, 5.0, "V"), +lowFuelPressure("Fuel pressure (low)", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 276, 0.03333333333333333, 0.0, 0.0, "kpa"), +highFuelPressure("Fuel pressure (high)", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 278, 0.1, 0.0, 0.0, "bar"), +targetLambda("fuel: target lambda", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 280, 1.0E-4, 0.0, 0.0, ""), +AFRValue("Air/Fuel Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 282, 0.001, 0.0, 0.0, "AFR"), +VssAcceleration("Vss Accel", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 284, 0.0033333333333333335, 0.0, 0.0, "m/s2"), +lambdaValue2("Lambda 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 286, 1.0E-4, 0.0, 0.0, ""), +AFRValue2("Air/Fuel Ratio 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 288, 0.001, 0.0, 0.0, "AFR"), +vvtPositionB1E("VVT: bank 1 exhaust", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 290, 0.02, 0.0, 0.0, "deg"), +vvtPositionB2I("VVT: bank 2 intake", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 292, 0.02, 0.0, 0.0, "deg"), +vvtPositionB2E("VVT: bank 2 exhaust", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 294, 0.02, 0.0, 0.0, "deg"), +fuelPidCorrection1("fuelPidCorrection1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 296, 0.01, -20.0, 20.0, "%"), +fuelPidCorrection2("fuelPidCorrection2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 298, 0.01, -20.0, 20.0, "%"), +rawTps1Secondary("rawTps1Secondary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 300, 0.001, 0.0, 5.0, "V"), +rawTps2Primary("rawTps2Primary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 302, 0.001, 0.0, 5.0, "V"), +rawTps2Secondary("rawTps2Secondary", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 304, 0.001, 0.0, 5.0, "V"), +knockCount("knock: count", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 306, 1.0, 0.0, 0.0, ""), +accelerationZ("Acceleration: Z", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 308, 0.01, 0.0, 0.0, "G"), +accelerationRoll("Acceleration: Roll", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 310, 0.01, 0.0, 0.0, "G"), +accelerationYaw("Acceleration: Yaw", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 312, 0.01, 0.0, 0.0, "G"), +vvtTargets1("vvtTargets1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 314, 1.0, 0.0, 0.0, "deg"), +vvtTargets2("vvtTargets2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 315, 1.0, 0.0, 0.0, "deg"), +vvtTargets3("vvtTargets3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 316, 1.0, 0.0, 0.0, "deg"), +vvtTargets4("vvtTargets4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 317, 1.0, 0.0, 0.0, "deg"), +turboSpeed("Turbocharger Speed", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 318, 1.0, 0.0, 0.0, "hz"), +wbTemperature1("wbTemperature1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 320, 1.0, 0.0, 1000.0, "deg C"), +wbTemperature2("wbTemperature2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 322, 1.0, 0.0, 1000.0, "deg C"), +wbHeaterDuty1("wbHeaterDuty1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 324, 1.0, 0.0, 100.0, "%"), +wbHeaterDuty2("wbHeaterDuty2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 325, 1.0, 0.0, 100.0, "%"), +tps1Split("tps1Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 326, 0.01, 0.0, 0.0, "%"), +tps2Split("tps2Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 328, 0.01, 0.0, 0.0, "%"), +tps12Split("tps12Split", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 330, 0.01, 0.0, 0.0, "%"), +accPedalSplit("accPedalSplit", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 332, 0.01, 0.0, 0.0, "%"), +m_requested_pump("DI: Pump Angle", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 334, 0.02, 0.0, 0.0, "deg"), +boostControlTarget("Boost Target", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 336, 0.03333333333333333, 0.0, 0.0, "kPa"), +sparkCutReason("Spark Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 338, 1.0, 0.0, 0.0, "code"), +fuelCutReason("Fuel Cut Code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 339, 1.0, 0.0, 0.0, "code"), +fuel_requested_percent("DI: fuel_requested_percent", SensorCategory.SENSOR_INPUTS, FieldType.INT, 340, 1.0, 0.0, 100.0, "v"), +fuel_requested_percent_pi("DI: fuel_requested_percent_pi", SensorCategory.SENSOR_INPUTS, FieldType.INT, 344, 1.0, 0.0, 100.0, "v"), +m_I_sum_percent("DI: m_I_sum_percent", SensorCategory.SENSOR_INPUTS, FieldType.INT, 348, 1.0, 0.0, 100.0, "v"), +m_pressureTarget_kPa("DI: m_pressureTarget_kPa", SensorCategory.SENSOR_INPUTS, FieldType.INT, 352, 1.0, 0.0, 100.0, "v"), +mafEstimate("MAF estimate", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 356, 0.1, 0.0, 0.0, "kg/h"), +instantRpm("instantRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 358, 1.0, 0.0, 0.0, "rpm"), +di_nextStart("DI: next start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 360, 1.0, 0.0, 100.0, "v"), +systemEventReuse("systemEventReuse", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 364, 1.0, 0.0, 0.0, "counter"), +rawMap("rawMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 366, 0.001, 0.0, 5.0, "V"), +rawAfr("rawAfr", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 368, 0.001, 0.0, 5.0, "V"), +tpsAccelFrom("tpsAccelFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 370, 1.0, 0.0, 100.0, "%"), +tpsAccelTo("tpsAccelTo", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 371, 1.0, 0.0, 100.0, "%"), +calibrationValue2("calibrationValue2", SensorCategory.SENSOR_INPUTS, FieldType.INT, 372, 1.0, 0.0, 0.0, ""), +luaInvocationCounter("luaInvocationCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 380, 1.0, 0.0, 0.0, "count"), +luaLastCycleDuration("luaLastCycleDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT, 384, 1.0, 0.0, 0.0, "nt"), +testBenchIter("testBenchIter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 388, 1.0, 0.0, 0.0, "count"), +unusedInTheMiddle1("unusedInTheMiddle1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 389, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle2("unusedInTheMiddle2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 390, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle3("unusedInTheMiddle3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 391, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle4("unusedInTheMiddle4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 392, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle5("unusedInTheMiddle5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 393, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle6("unusedInTheMiddle6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 394, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle7("unusedInTheMiddle7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 395, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle8("unusedInTheMiddle8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 396, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle9("unusedInTheMiddle9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 397, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle10("unusedInTheMiddle10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 398, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle11("unusedInTheMiddle11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 399, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle12("unusedInTheMiddle12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 400, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle13("unusedInTheMiddle13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 401, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle14("unusedInTheMiddle14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 402, 1.0, 0.0, 0.0, ""), +unusedInTheMiddle15("unusedInTheMiddle15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 403, 1.0, 0.0, 0.0, ""), +auxLinear1("Aux Linear 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 404, 0.01, 0.0, 0.0, ""), +auxLinear2("Aux Linear 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 406, 0.01, 0.0, 0.0, ""), +TEMPLOG_MAP_AT_CYCLE_COUNT("TEMPLOG_MAP_AT_CYCLE_COUNT", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 412, 1.0, -10000.0, 10000.0, ""), +TEMPLOG_map_peak("TEMPLOG_map_peak", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 413, 1.0, -10000.0, 10000.0, ""), +boostControllerOutput("Boost Output", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 414, 0.5, 0.0, 100.0, "%"), +boostControllerOpenLoopPart("Boost Open Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 415, 0.5, 0.0, 100.0, "%"), +TEMPLOG_MAP_AT_SPECIAL_POINT("TEMPLOG_MAP_AT_SPECIAL_POINT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 416, 1.0, -10000.0, 10000.0, ""), +TEMPLOG_MAP_AT_DIFF("TEMPLOG_MAP_AT_DIFF", SensorCategory.SENSOR_INPUTS, FieldType.INT, 420, 1.0, -10000.0, 10000.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 424, 1.0, -10000.0, 10000.0, ""), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 428, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 432, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 436, 1.0, -10000.0, 10000.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 437, 1.0, -10000.0, 10000.0, ""), +vvtSyncCounter("vvtSyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 438, 1.0, -10000.0, 10000.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 439, 1.0, -10000.0, 10000.0, ""), +fallbackMap("fallbackMap", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 440, 0.1, 0.0, 1000.0, "kPa"), +boostControllerClosedLoopPart("Boost Closed Loop", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 442, 0.5, -50.0, 50.0, "%"), +detectedGear("Detected Gear", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 443, 1.0, 0.0, 8.0, ""), +timingCltCorrection("timingCltCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 444, 0.01, -20.0, 20.0, "deg"), +timingIatCorrection("timingIatCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 446, 0.01, -20.0, 20.0, "deg"), +timingPidCorrection("timingPidCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 448, 0.01, -20.0, 20.0, "deg"), +instantMAPValue("Instant MAP", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 450, 0.03333333333333333, 0.0, 655.0, "kPa"), +mostRecentTimeBetweenSparkEvents("mostRecentTimeBetweenSparkEvents", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 452, 1.0, -10000.0, 10000.0, ""), +mostRecentTimeBetweenIgnitionEvents("mostRecentTimeBetweenIgnitionEvents", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 454, 1.0, -10000.0, 10000.0, ""), +maxLockedDuration("maxLockedDuration", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 456, 1.0, -10000.0, 10000.0, ""), +maxTriggerReentrant("maxTriggerReentrant", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 458, 1.0, -10000.0, 10000.0, ""), +canWriteOk("canWriteOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 460, 1.0, -10000.0, 10000.0, ""), +canWriteNotOk("canWriteNotOk", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 462, 1.0, -10000.0, 10000.0, ""), +triggerPrimaryFall("triggerPrimaryFall", SensorCategory.SENSOR_INPUTS, FieldType.INT, 464, 1.0, -10000.0, 10000.0, ""), +triggerPrimaryRise("triggerPrimaryRise", SensorCategory.SENSOR_INPUTS, FieldType.INT, 468, 1.0, -10000.0, 10000.0, ""), +triggerSecondaryFall("triggerSecondaryFall", SensorCategory.SENSOR_INPUTS, FieldType.INT, 472, 1.0, -10000.0, 10000.0, ""), +triggerSecondaryRise("triggerSecondaryRise", SensorCategory.SENSOR_INPUTS, FieldType.INT, 476, 1.0, -10000.0, 10000.0, ""), +triggerVvtFall("triggerVvtFall", SensorCategory.SENSOR_INPUTS, FieldType.INT, 480, 1.0, -10000.0, 10000.0, ""), +triggerVvtRise("triggerVvtRise", SensorCategory.SENSOR_INPUTS, FieldType.INT, 484, 1.0, -10000.0, 10000.0, ""), +startStopStateToggleCounter("startStopStateToggleCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 488, 1.0, -10000.0, 10000.0, ""), +starterState("starterState", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 489, 1.0, -10000.0, 10000.0, ""), +starterRelayDisable("starterRelayDisable", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 490, 1.0, -10000.0, 10000.0, ""), +multiSparkCounter("multiSparkCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 491, 1.0, -10000.0, 10000.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 492, 1.0, -10000.0, 10000.0, ""), +injectorFlowPressureRatio("injectorFlowPressureRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 496, 1.0, -10000.0, 10000.0, ""), +injectorFlowPressureDelta("injectorFlowPressureDelta", SensorCategory.SENSOR_INPUTS, FieldType.INT, 500, 1.0, -10000.0, 10000.0, "kPa"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 504, 1.0, -10000.0, 10000.0, "%"), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 508, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 512, 1.0, -10000.0, 10000.0, "%"), +alternatorStatus("alternatorStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 516, 1.0, -1.0, -1.0, ""), +idleStatus("idleStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 528, 1.0, -1.0, -1.0, ""), +etbStatus("etbStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 540, 1.0, -1.0, -1.0, ""), +boostStatus("boostStatus", SensorCategory.SENSOR_INPUTS, FieldType.INT, 552, 1.0, -1.0, -1.0, ""), +auxSpeed1("aux speed 1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 564, 1.0, 0.0, 0.0, "s"), +auxSpeed2("aux speed 2", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 566, 1.0, 0.0, 0.0, "s"), +unusedAtTheEnd1("unusedAtTheEnd1", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 568, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd2("unusedAtTheEnd2", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 569, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd3("unusedAtTheEnd3", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 570, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd4("unusedAtTheEnd4", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 571, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd5("unusedAtTheEnd5", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 572, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd6("unusedAtTheEnd6", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 573, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd7("unusedAtTheEnd7", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 574, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd8("unusedAtTheEnd8", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 575, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd9("unusedAtTheEnd9", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 576, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd10("unusedAtTheEnd10", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 577, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd11("unusedAtTheEnd11", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 578, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd12("unusedAtTheEnd12", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 579, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd13("unusedAtTheEnd13", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 580, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd14("unusedAtTheEnd14", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 581, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd15("unusedAtTheEnd15", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 582, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd16("unusedAtTheEnd16", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 583, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd17("unusedAtTheEnd17", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 584, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd18("unusedAtTheEnd18", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 585, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd19("unusedAtTheEnd19", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 586, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd20("unusedAtTheEnd20", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 587, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd21("unusedAtTheEnd21", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 588, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd22("unusedAtTheEnd22", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 589, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd23("unusedAtTheEnd23", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 590, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd24("unusedAtTheEnd24", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 591, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd25("unusedAtTheEnd25", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 592, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd26("unusedAtTheEnd26", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 593, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd27("unusedAtTheEnd27", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 594, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd28("unusedAtTheEnd28", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 595, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd29("unusedAtTheEnd29", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 596, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd30("unusedAtTheEnd30", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 597, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd31("unusedAtTheEnd31", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 598, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd32("unusedAtTheEnd32", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 599, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd33("unusedAtTheEnd33", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 600, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd34("unusedAtTheEnd34", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 601, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd35("unusedAtTheEnd35", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 602, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd36("unusedAtTheEnd36", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 603, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd37("unusedAtTheEnd37", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 604, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd38("unusedAtTheEnd38", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 605, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd39("unusedAtTheEnd39", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 606, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd40("unusedAtTheEnd40", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 607, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd41("unusedAtTheEnd41", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 608, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd42("unusedAtTheEnd42", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 609, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd43("unusedAtTheEnd43", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 610, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd44("unusedAtTheEnd44", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 611, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd45("unusedAtTheEnd45", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 612, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd46("unusedAtTheEnd46", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 613, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd47("unusedAtTheEnd47", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 614, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd48("unusedAtTheEnd48", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 615, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd49("unusedAtTheEnd49", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 616, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd50("unusedAtTheEnd50", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 617, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd51("unusedAtTheEnd51", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 618, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd52("unusedAtTheEnd52", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 619, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd53("unusedAtTheEnd53", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 620, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd54("unusedAtTheEnd54", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 621, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd55("unusedAtTheEnd55", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 622, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd56("unusedAtTheEnd56", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 623, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd57("unusedAtTheEnd57", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 624, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd58("unusedAtTheEnd58", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 625, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd59("unusedAtTheEnd59", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 626, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd60("unusedAtTheEnd60", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 627, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd61("unusedAtTheEnd61", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 628, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd62("unusedAtTheEnd62", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 629, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd63("unusedAtTheEnd63", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 630, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd64("unusedAtTheEnd64", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 631, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd65("unusedAtTheEnd65", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 632, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd66("unusedAtTheEnd66", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 633, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd67("unusedAtTheEnd67", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 634, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd68("unusedAtTheEnd68", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 635, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd69("unusedAtTheEnd69", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 636, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd70("unusedAtTheEnd70", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 637, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd71("unusedAtTheEnd71", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 638, 1.0, 0.0, 0.0, ""), +unusedAtTheEnd72("unusedAtTheEnd72", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 639, 1.0, 0.0, 0.0, ""), +m_requested_pump("Computed requested pump duration in degrees (not including deadtime)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +fuel_requested_percent("fuel_requested_percent", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +fuel_requested_percent_pi("fuel_requested_percent_pi", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +nextLobe("nextLobe", SensorCategory.SENSOR_INPUTS, FieldType.INT, 16, 1.0, -1.0, -1.0, ""), +nextStart("nextStart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 20, 1.0, -1.0, -1.0, ""), +m_deadtime("m_deadtime", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +pressureDelta("pressureDelta", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +pressureRatio("pressureRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +retardThresholdRpm("retardThresholdRpm", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +openLoopPart("openLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +closedLoopPart("closedLoopPart", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +latest_usage_ac_control("latest_usage_ac_control", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +acSwitchLastChangeTimeMs("acSwitchLastChangeTimeMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +sd("sd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +targetAFR("targetAFR", SensorCategory.SENSOR_INPUTS, FieldType.INT, 24, 1.0, -1.0, -1.0, ""), +engineCycleDurationMs("engineCycleDurationMs", SensorCategory.SENSOR_INPUTS, FieldType.INT, 28, 1.0, -1.0, -1.0, ""), +minRpmKcurrentTPS("minRpmKcurrentTPS", SensorCategory.SENSOR_INPUTS, FieldType.INT, 32, 1.0, -1.0, -1.0, ""), +currentTpsAdc("currentTpsAdc", SensorCategory.SENSOR_INPUTS, FieldType.INT, 36, 1.0, -1.0, -1.0, ""), +tpsVoltageMCU("tpsVoltageMCU", SensorCategory.SENSOR_INPUTS, FieldType.INT, 40, 1.0, -1.0, -1.0, ""), +tpsVoltageBoard("tpsVoltageBoard", SensorCategory.SENSOR_INPUTS, FieldType.INT, 44, 1.0, -1.0, -1.0, ""), +currentBaroCorrectedVE("currentBaroCorrectedVE", SensorCategory.SENSOR_INPUTS, FieldType.INT, 48, 1.0, -1.0, -1.0, ""), +injectorFlowCorrection("injectorFlowCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 52, 1.0, -1.0, -1.0, ""), +baroCorrection("baroCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 56, 1.0, -1.0, -1.0, ""), +cranking("cranking", SensorCategory.SENSOR_INPUTS, FieldType.INT, 60, 1.0, -1.0, -1.0, ""), +running("running", SensorCategory.SENSOR_INPUTS, FieldType.INT, 80, 1.0, -1.0, -1.0, ""), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 108, 1.0, -1.0, -1.0, ""), +targetFromTable("targetFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 112, 1.0, -1.0, -1.0, ""), +sparkDwell("ignition dwell duration in ms\nSee also dwellAngle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 116, 1.0, -1.0, -1.0, ""), +dwellAngle("ignition dwell duration as crankshaft angle\nNAN if engine is stopped\nSee also sparkDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 120, 1.0, -1.0, -1.0, ""), +cltTimingCorrection("cltTimingCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 124, 1.0, -1.0, -1.0, ""), +tpsFrom("tpsFrom", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +tpsTo("tpsTo", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +deltaTps("deltaTps", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +extraFuel("extraFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 12, 1.0, -1.0, -1.0, ""), +valueFromTable("valueFromTable", SensorCategory.SENSOR_INPUTS, FieldType.INT, 16, 1.0, -1.0, -1.0, ""), +fractionalInjFuel("fractionalInjFuel", SensorCategory.SENSOR_INPUTS, FieldType.INT, 24, 1.0, -1.0, -1.0, ""), +accumulatedValue("accumulatedValue", SensorCategory.SENSOR_INPUTS, FieldType.INT, 28, 1.0, -1.0, -1.0, ""), +maxExtraPerCycle("maxExtraPerCycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 32, 1.0, -1.0, -1.0, ""), +maxExtraPerPeriod("maxExtraPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 36, 1.0, -1.0, -1.0, ""), +maxInjectedPerPeriod("maxInjectedPerPeriod", SensorCategory.SENSOR_INPUTS, FieldType.INT, 40, 1.0, -1.0, -1.0, ""), +cycleCnt("cycleCnt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 44, 1.0, -1.0, -1.0, ""), +hwEventCounters1("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +hwEventCounters2("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +hwEventCounters3("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +hwEventCounters4("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 12, 1.0, -1.0, -1.0, ""), +hwEventCounters5("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 16, 1.0, -1.0, -1.0, ""), +hwEventCounters6("Counter of hardware events since ECU start", SensorCategory.SENSOR_INPUTS, FieldType.INT, 20, 1.0, -1.0, -1.0, ""), +vvtCamCounter("vvtCamCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 24, 1.0, -1.0, -1.0, ""), +currentGap("currentGap", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +totalRevolutionCounter("Crank revolution counter", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("* fuel injection time correction to account for wall wetting effect, for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +wallFuel("Amount of fuel on the wall, in ms of injector open time, for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +currentIdlePosition("that's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +baseIdlePosition("current position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("iacByTpsTaper portion of idle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 12, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("true in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 16, 1.0, -1.0, -1.0, ""), +targetRpmByClt("targetRpmByClt", SensorCategory.SENSOR_INPUTS, FieldType.INT, 24, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("targetRpmAcBump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 28, 1.0, -1.0, -1.0, ""), +baseDwell("baseDwell", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +dwellVoltageCorrection("dwellVoltageCorrection", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +luaTimingAdd("luaTimingAdd", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), +luaTimingMult("luaTimingMult", SensorCategory.SENSOR_INPUTS, FieldType.INT, 12, 1.0, -1.0, -1.0, ""), +idlePosition("idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 0, 1.0, -1.0, -1.0, ""), +trim("trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 4, 1.0, -1.0, -1.0, ""), +luaAdjustment("luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 8, 1.0, -1.0, -1.0, ""), diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b4adcaa0e2..7459c59060 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java index 2076a7b739..ef21aebc3b 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/UsagesReader.java @@ -2,6 +2,7 @@ package com.rusefi.ldmp; import com.rusefi.ConfigDefinition; import com.rusefi.ReaderState; +import com.rusefi.output.FragmentDialogConsumer; import com.rusefi.output.JavaSensorsConsumer; import com.rusefi.util.SystemOut; import org.yaml.snakeyaml.Yaml; @@ -40,6 +41,8 @@ public class UsagesReader { StringBuilder totalSensors = new StringBuilder(); + StringBuilder fancyNewStuff = new StringBuilder(); + UsagesReader usagesReader = new UsagesReader(); EntryHandler handler = new EntryHandler() { @@ -72,6 +75,8 @@ public class UsagesReader { JavaSensorsConsumer javaSensorsConsumer = new JavaSensorsConsumer(usagesReader.sensorTsPosition); state.addDestination(javaSensorsConsumer); + FragmentDialogConsumer fragmentDialogConsumer = new FragmentDialogConsumer(name); + state.addDestination(fragmentDialogConsumer); state.addPrepend(prepend); state.addCHeaderDestination(folder + File.separator + name + "_generated.h"); @@ -81,6 +86,8 @@ public class UsagesReader { usagesReader.sensorTsPosition = javaSensorsConsumer.sensorTsPosition; totalSensors.append(javaSensorsConsumer.getContent()); + fancyNewStuff.append(fragmentDialogConsumer.getContent()); + SystemOut.println("TS_TOTAL_OUTPUT_SIZE=" + usagesReader.sensorTsPosition); } }; @@ -97,6 +104,10 @@ public class UsagesReader { try (FileWriter fw = new FileWriter("console/binary/generated/sensors.java")) { fw.write(totalSensors.toString()); } + + try (FileWriter fw = new FileWriter("console/binary/generated/wip.ini")) { + fw.write(totalSensors.toString()); + } } interface EntryHandler { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java index fd15f7eab2..a86a3432ee 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java @@ -2,11 +2,14 @@ package com.rusefi.output; import com.rusefi.ConfigField; import com.rusefi.ReaderState; +import org.jetbrains.annotations.NotNull; import java.io.IOException; +import static com.rusefi.output.JavaSensorsConsumer.quote; + public class FragmentDialogConsumer implements ConfigurationConsumer { - private final StringBuilder sb = new StringBuilder(); + private final StringBuilder graphLines = new StringBuilder(); private final StringBuilder indicatorPanel = new StringBuilder(); private final String fragmentName; @@ -37,14 +40,14 @@ public class FragmentDialogConsumer implements ConfigurationConsumer { if (!hasIndicators) { hasIndicators = true; - indicatorPanel.append("indicatorPanel = " + - fragmentName + - "IndicatorPanel, 2\n"); + indicatorPanel.append("indicatorPanel = " + getPanelName() + ", 2\n"); } - indicatorPanel.append("indicator = {" + configField.getName() + "}, \"No\", \"Yes\"\n"); + indicatorPanel.append("\tindicator = {" + configField.getName() + "}, \"No\", \"Yes\"\n"); } + graphLines.append("\tgraphLine = " + configField.getName() + "\n"); + return 0; } @@ -53,7 +56,32 @@ public class FragmentDialogConsumer implements ConfigurationConsumer { } + @NotNull + private String getPanelName() { + return fragmentName + "IndicatorPanel"; + } + public String getContent() { - return indicatorPanel + sb.toString(); + + String dialogDeclaration = "dialog = " + fragmentName + "Dialog, " + quote(fragmentName) + "\n"; + + String indicatorPanelUsageLine = (indicatorPanel.length() > 0) ? "\tpanel = " + getPanelName() + "\n" : ""; + + + String liveGraphControlDeclaration = "liveGraph = " + getGraphControlName() + + ", " + quote("Graph") + ", South\n"; + + return indicatorPanel + "\n" + + liveGraphControlDeclaration + + graphLines + "\n" + + dialogDeclaration + + indicatorPanelUsageLine + + "\tpanel = " + getGraphControlName() + "\n" + ; + } + + @NotNull + private String getGraphControlName() { + return fragmentName + "Graph"; } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java index 893d50449d..a756abfe40 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java @@ -64,8 +64,7 @@ public class JavaSensorsConsumer implements ConfigurationConsumer { fieldsStrategy.run(readerState, structure); } - - private static String quote(String string) { + public static String quote(String string) { return "\"" + string + "\""; } diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java index 85fac6a729..ebf168b66f 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/FragmentDialogConsumerTest.java @@ -33,9 +33,26 @@ public class FragmentDialogConsumerTest { state.readBufferedReader(outputChannels, fragmentDialogConsumer); assertEquals("indicatorPanel = ac_stateIndicatorPanel, 2\n" + - "indicator = {sd_present}, \"No\", \"Yes\"\n" + - "indicator = {sd_present2}, \"No\", \"Yes\"\n" + - "indicator = {sd_present3}, \"No\", \"Yes\"\n", + "\tindicator = {sd_present}, \"No\", \"Yes\"\n" + + "\tindicator = {sd_present2}, \"No\", \"Yes\"\n" + + "\tindicator = {sd_present3}, \"No\", \"Yes\"\n" + + "\n" + + "liveGraph = ac_stateGraph, \"Graph\", South\n" + + "\tgraphLine = sd_present\n" + + "\tgraphLine = sd_present2\n" + + "\tgraphLine = sd_present3\n" + + "\tgraphLine = RPMValue\n" + + "\tgraphLine = rpmAcceleration\n" + + "\tgraphLine = speedToRpmRatio\n" + + "\tgraphLine = alignmentFill_at_10\n" + + "\tgraphLine = luaTimingMult\n" + + "\tgraphLine = vehicleSpeedKph\n" + + "\tgraphLine = internalMcuTemperature\n" + + "\tgraphLine = alignmentFill_at_18\n" + + "\n" + + "dialog = ac_stateDialog, \"ac_state\"\n" + + "\tpanel = ac_stateIndicatorPanel\n" + + "\tpanel = ac_stateGraph\n", fragmentDialogConsumer.getContent()); }