diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml index 25f3ddd09b..dc6d32284d 100644 --- a/.github/workflows/gen-configs.yaml +++ b/.github/workflows/gen-configs.yaml @@ -51,7 +51,6 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub gen-configs Action" git add firmware/tunerstudio/generated - git add firmware/controllers/generated git add 'firmware/*/auto_generated*.cpp' git add 'firmware/*/auto_generated*.h' git add 'firmware/config/boards/*/generated_ts_name_by_pin.cpp' diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh index f64e82ce66..5ddde44dc3 100755 --- a/firmware/gen_config_common.sh +++ b/firmware/gen_config_common.sh @@ -5,10 +5,10 @@ COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \ COMMON_GEN_CONFIG=" -enumInputFile controllers/algo/engine_types.h \ -enumInputFile controllers/algo/rusefi_enums.h \ - -readfile OUTPUTS_SECTION_FROM_FILE tunerstudio/generated/temp/output_channels.ini \ - -readfile DATALOG_SECTION_FROM_FILE tunerstudio/generated/temp/data_logs.ini \ - -readfile LIVE_DATA_MENU_FROM_FILE tunerstudio/generated/temp/fancy_menu.ini \ - -readfile LIVE_DATA_PANELS_FROM_FILE tunerstudio/generated/temp/fancy_content.ini \ + -readfile OUTPUTS_SECTION_FROM_FILE generated/output_channels.ini \ + -readfile DATALOG_SECTION_FROM_FILE generated/data_logs.ini \ + -readfile LIVE_DATA_MENU_FROM_FILE generated/fancy_menu.ini \ + -readfile LIVE_DATA_PANELS_FROM_FILE generated/fancy_content.ini \ -ts_destination tunerstudio \ -firing_order controllers/algo/firing_order.h \ -triggerInputFolder ../unit_tests \ diff --git a/firmware/tunerstudio/generated/temp/data_logs.ini b/firmware/tunerstudio/generated/temp/data_logs.ini deleted file mode 100644 index 2ac2557494..0000000000 --- a/firmware/tunerstudio/generated/temp/data_logs.ini +++ /dev/null @@ -1,576 +0,0 @@ -entry = sd_present, "SD: Present", int, "%d" -entry = sd_logging_internal, "SD: Logging", int, "%d" -entry = triggerScopeReady, "triggerScopeReady", int, "%d" -entry = antilagTriggered, "antilagTriggered", int, "%d" -entry = isFanOn, "Radiator Fan", int, "%d" -entry = isO2HeaterOn, "isO2HeaterOn", int, "%d" -entry = checkEngine, "checkEngine", int, "%d" -entry = needBurn, "needBurn", int, "%d" -entry = sd_msd, "SD: MSD", int, "%d" -entry = isFan2On, "Radiator Fan 2", int, "%d" -entry = acrActive, "Harley ACR: Active", int, "%d" -entry = toothLogReady, "Tooth Logger Ready", int, "%d" -entry = isTpsError, "Error: TPS", int, "%d" -entry = isCltError, "Error: CLT", int, "%d" -entry = isMapError, "Error: MAP", int, "%d" -entry = isIatError, "Error: IAT", int, "%d" -entry = isTriggerError, "Error: Trigger", int, "%d" -entry = hasCriticalError, "Error: Active", int, "%d" -entry = isWarnNow, "Warning: Active", int, "%d" -entry = isPedalError, "Error: Pedal", int, "%d" -entry = launchTriggered, "Launch Control Triggered", int, "%d" -entry = isTps2Error, "Error: TPS2", int, "%d" -entry = injectorFault, "Injector Fault", int, "%d" -entry = ignitionFault, "Ignition Fault", int, "%d" -entry = isMainRelayOn, "isMainRelayOn", int, "%d" -entry = isUsbConnected, "isUsbConnected", int, "%d" -entry = dfcoActive, "dfcoActive", int, "%d" -entry = RPMValue, "RPM", int, "%d" -entry = rpmAcceleration, "dRPM", int, "%d" -entry = speedToRpmRatio, "Gearbox Ratio", float, "%.3f" -entry = vehicleSpeedKph, "Vehicle Speed", int, "%d" -entry = internalMcuTemperature, "ECU temperature", int, "%d" -entry = coolant, "CLT", float, "%.3f" -entry = intake, "IAT", float, "%.3f" -entry = auxTemp1, "auxTemp1", float, "%.3f" -entry = auxTemp2, "auxTemp2", float, "%.3f" -entry = TPSValue, "TPS", float, "%.3f" -entry = throttlePedalPosition, "Throttle pedal position", float, "%.3f" -entry = tpsADC, "tpsADC", int, "%d" -entry = rawMaf, "rawMaf", float, "%.3f" -entry = mafMeasured, "MAF", float, "%.3f" -entry = MAPValue, "MAP", float, "%.3f" -entry = baroPressure, "baroPressure", float, "%.3f" -entry = lambdaValue, "Lambda", float, "%.3f" -entry = VBatt, "VBatt", float, "%.3f" -entry = oilPressure, "Oil Pressure", float, "%.3f" -entry = vvtPositionB1I, "VVT: bank 1 intake", float, "%.3f" -entry = actualLastInjection, "Fuel: Last inj pulse width", float, "%.3f" -entry = injectorDutyCycle, "Fuel: injector duty cycle", float, "%.3f" -entry = veValue, "Fuel: VE", float, "%.3f" -entry = injectionOffset, "Fuel: Injection timing SOI", int, "%d" -entry = engineMakeCodeNameCrc16, "Engine CRC16", int, "%d" -entry = wallFuelAmount, "Fuel: wall amount", float, "%.3f" -entry = wallFuelCorrectionValue, "Fuel: wall correction", float, "%.3f" -entry = revolutionCounterSinceStart, "revolutionCounterSinceStart", int, "%d" -entry = canReadCounter, "CAN: Rx", int, "%d" -entry = tpsAccelFuel, "Fuel: TPS AE add fuel ms", float, "%.3f" -entry = ignitionAdvance, "Ign: Timing Base", float, "%.3f" -entry = currentIgnitionMode, "Ign: Mode", int, "%d" -entry = currentInjectionMode, "Fuel: Injection mode", int, "%d" -entry = coilDutyCycle, "Ign: Coil duty cycle", float, "%.3f" -entry = etbTarget, "ETB Target", float, "%.3f" -entry = etb1DutyCycle, "ETB: Duty", float, "%.3f" -entry = fuelTankLevel, "Fuel level", float, "%.3f" -entry = totalFuelConsumption, "Fuel: Total consumed", int, "%d" -entry = fuelFlowRate, "Fuel: Flow rate", float, "%.3f" -entry = TPS2Value, "TPS2", float, "%.3f" -entry = tuneCrc16, "Tune CRC16", int, "%d" -entry = seconds, "Uptime", int, "%d" -entry = engineMode, "Engine Mode", int, "%d" -entry = firmwareVersion, "firmware", int, "%d" -entry = rawWastegatePosition, "rawWastegatePosition", float, "%.3f" -entry = accelerationLat, "Accel: Lateral", float, "%.3f" -entry = accelerationLon, "Accel: Longitudinal", float, "%.3f" -entry = detectedGear, "Detected Gear", int, "%d" -entry = maxTriggerReentrant, "maxTriggerReentrant", int, "%d" -entry = rawLowFuelPressure, "rawLowFuelPressure", float, "%.3f" -entry = rawHighFuelPressure, "rawHighFuelPressure", float, "%.3f" -entry = lowFuelPressure, "Fuel pressure (low)", float, "%.3f" -entry = highFuelPressure, "Fuel pressure (high)", float, "%.3f" -entry = rawPpsSecondary, "rawPpsSecondary", float, "%.3f" -entry = tcuDesiredGear, "TCU: Desired Gear", int, "%d" -entry = flexPercent, "Flex Ethanol %", float, "%.3f" -entry = wastegatePositionSensor, "Wastegate position sensor", float, "%.3f" -entry = calibrationValue, "calibrationValue", float, "%.3f" -entry = calibrationMode, "calibrationMode", int, "%d" -entry = idleStepperTargetPosition, "Idle: Stepper target position", int, "%d" -entry = tsConfigVersion, "tsConfigVersion", int, "%d" -entry = totalTriggerErrorCounter, "Trigger Error Counter", int, "%d" -entry = orderingErrorCounter, "orderingErrorCounter", int, "%d" -entry = warningCounter, "Warning: counter", int, "%d" -entry = lastErrorCode, "Warning: last", int, "%d" -entry = recentErrorCode1, "recentErrorCode 1", int, "%d" -entry = recentErrorCode2, "recentErrorCode 2", int, "%d" -entry = recentErrorCode3, "recentErrorCode 3", int, "%d" -entry = recentErrorCode4, "recentErrorCode 4", int, "%d" -entry = recentErrorCode5, "recentErrorCode 5", int, "%d" -entry = recentErrorCode6, "recentErrorCode 6", int, "%d" -entry = recentErrorCode7, "recentErrorCode 7", int, "%d" -entry = recentErrorCode8, "recentErrorCode 8", int, "%d" -entry = debugFloatField1, "debugFloatField1", float, "%.3f" -entry = debugFloatField2, "debugFloatField2", float, "%.3f" -entry = debugFloatField3, "debugFloatField3", float, "%.3f" -entry = debugFloatField4, "debugFloatField4", float, "%.3f" -entry = debugFloatField5, "debugFloatField5", float, "%.3f" -entry = debugFloatField6, "debugFloatField6", float, "%.3f" -entry = debugFloatField7, "debugFloatField7", float, "%.3f" -entry = debugIntField1, "debugIntField1", int, "%d" -entry = debugIntField2, "debugIntField2", int, "%d" -entry = debugIntField3, "debugIntField3", int, "%d" -entry = debugIntField4, "debugIntField4", int, "%d" -entry = debugIntField5, "debugIntField5", int, "%d" -entry = egt1, "EGT 1", int, "%d" -entry = egt2, "EGT 2", int, "%d" -entry = egt3, "EGT 3", int, "%d" -entry = egt4, "EGT 4", int, "%d" -entry = egt5, "EGT 5", int, "%d" -entry = egt6, "EGT 6", int, "%d" -entry = egt7, "EGT 7", int, "%d" -entry = egt8, "EGT 8", int, "%d" -entry = rawTps1Primary, "rawTps1Primary", float, "%.3f" -entry = rawPpsPrimary, "rawPpsPrimary", float, "%.3f" -entry = rawClt, "rawClt", float, "%.3f" -entry = rawIat, "rawIat", float, "%.3f" -entry = rawOilPressure, "rawOilPressure", float, "%.3f" -entry = fuelClosedLoopBinIdx, "fuelClosedLoopBinIdx", int, "%d" -entry = tcuCurrentGear, "Current Gear", int, "%d" -entry = AFRValue, "Air/Fuel Ratio", float, "%.3f" -entry = VssAcceleration, "Vss Accel", float, "%.3f" -entry = lambdaValue2, "Lambda 2", float, "%.3f" -entry = AFRValue2, "Air/Fuel Ratio 2", float, "%.3f" -entry = vvtPositionB1E, "VVT: bank 1 exhaust", float, "%.3f" -entry = vvtPositionB2I, "VVT: bank 2 intake", float, "%.3f" -entry = vvtPositionB2E, "VVT: bank 2 exhaust", float, "%.3f" -entry = fuelPidCorrection1, "Fuel: Trim bank 1", float, "%.3f" -entry = fuelPidCorrection2, "Fuel: Trim bank 2", float, "%.3f" -entry = rawTps1Secondary, "rawTps1Secondary", float, "%.3f" -entry = rawTps2Primary, "rawTps2Primary", float, "%.3f" -entry = rawTps2Secondary, "rawTps2Secondary", float, "%.3f" -entry = accelerationVert, "Accel: Vertical", float, "%.3f" -entry = gyroYaw, "Gyro: Yaw rate", float, "%.3f" -entry = vvtTargets1, "vvtTargets 1", int, "%d" -entry = vvtTargets2, "vvtTargets 2", int, "%d" -entry = vvtTargets3, "vvtTargets 3", int, "%d" -entry = vvtTargets4, "vvtTargets 4", int, "%d" -entry = turboSpeed, "Turbocharger Speed", int, "%d" -entry = ignitionAdvanceCyl1, "Ign: Timing Cyl 1", float, "%.3f" -entry = ignitionAdvanceCyl2, "Ign: Timing Cyl 2", float, "%.3f" -entry = ignitionAdvanceCyl3, "Ign: Timing Cyl 3", float, "%.3f" -entry = ignitionAdvanceCyl4, "Ign: Timing Cyl 4", float, "%.3f" -entry = ignitionAdvanceCyl5, "Ign: Timing Cyl 5", float, "%.3f" -entry = ignitionAdvanceCyl6, "Ign: Timing Cyl 6", float, "%.3f" -entry = ignitionAdvanceCyl7, "Ign: Timing Cyl 7", float, "%.3f" -entry = ignitionAdvanceCyl8, "Ign: Timing Cyl 8", float, "%.3f" -entry = ignitionAdvanceCyl9, "Ign: Timing Cyl 9", float, "%.3f" -entry = ignitionAdvanceCyl10, "Ign: Timing Cyl 10", float, "%.3f" -entry = ignitionAdvanceCyl11, "Ign: Timing Cyl 11", float, "%.3f" -entry = ignitionAdvanceCyl12, "Ign: Timing Cyl 12", float, "%.3f" -entry = tps1Split, "tps1Split", float, "%.3f" -entry = tps2Split, "tps2Split", float, "%.3f" -entry = tps12Split, "tps12Split", float, "%.3f" -entry = accPedalSplit, "accPedalSplit", float, "%.3f" -entry = sparkCutReason, "Ign: Cut Code", int, "%d" -entry = fuelCutReason, "Fuel: Cut Code", int, "%d" -entry = mafEstimate, "Air: Flow estimate", float, "%.3f" -entry = instantRpm, "instantRpm", int, "%d" -entry = rawMap, "rawMap", float, "%.3f" -entry = rawAfr, "rawAfr", float, "%.3f" -entry = calibrationValue2, "calibrationValue2", float, "%.3f" -entry = luaInvocationCounter, "Lua: Tick counter", int, "%d" -entry = luaLastCycleDuration, "Lua: Last tick duration", int, "%d" -entry = tcu_currentRange, "TCU: Current Range", int, "%d" -entry = tcRatio, "TCU: Torque Converter Ratio", float, "%.3f" -entry = lastShiftTime, "lastShiftTime", float, "%.3f" -entry = vssEdgeCounter, "vssEdgeCounter", int, "%d" -entry = issEdgeCounter, "issEdgeCounter", int, "%d" -entry = auxLinear1, "Aux linear #1", float, "%.3f" -entry = auxLinear2, "Aux linear #2", float, "%.3f" -entry = fallbackMap, "fallbackMap", float, "%.3f" -entry = instantMAPValue, "Instant MAP", float, "%.3f" -entry = maxLockedDuration, "maxLockedDuration", int, "%d" -entry = canWriteOk, "CAN: Tx OK", int, "%d" -entry = canWriteNotOk, "CAN: Tx err", int, "%d" -entry = triggerPrimaryFall, "triggerPrimaryFall", int, "%d" -entry = triggerPrimaryRise, "triggerPrimaryRise", int, "%d" -entry = triggerSecondaryFall, "triggerSecondaryFall", int, "%d" -entry = triggerSecondaryRise, "triggerSecondaryRise", int, "%d" -entry = triggerVvtFall, "triggerVvtFall", int, "%d" -entry = triggerVvtRise, "triggerVvtRise", int, "%d" -entry = starterState, "starterState", int, "%d" -entry = starterRelayDisable, "starterRelayDisable", int, "%d" -entry = multiSparkCounter, "Ign: Multispark count", int, "%d" -entry = extiOverflowCount, "extiOverflowCount", int, "%d" -entry = alternatorStatus_pTerm, "alternatorStatus_pTerm", float, "%.3f" -entry = alternatorStatus_iTerm, "alternatorStatus_iTerm", float, "%.3f" -entry = alternatorStatus_dTerm, "alternatorStatus_dTerm", float, "%.3f" -entry = alternatorStatus_output, "alternatorStatus_output", float, "%.3f" -entry = alternatorStatus_error, "alternatorStatus_error", float, "%.3f" -entry = alternatorStatus_resetCounter, "alternatorStatus_resetCounter", int, "%d" -entry = idleStatus_pTerm, "idleStatus_pTerm", float, "%.3f" -entry = idleStatus_iTerm, "idleStatus_iTerm", float, "%.3f" -entry = idleStatus_dTerm, "idleStatus_dTerm", float, "%.3f" -entry = idleStatus_output, "idleStatus_output", float, "%.3f" -entry = idleStatus_error, "idleStatus_error", float, "%.3f" -entry = idleStatus_resetCounter, "idleStatus_resetCounter", int, "%d" -entry = etbStatus_pTerm, "etbStatus_pTerm", float, "%.3f" -entry = etbStatus_iTerm, "etbStatus_iTerm", float, "%.3f" -entry = etbStatus_dTerm, "etbStatus_dTerm", float, "%.3f" -entry = etbStatus_output, "etbStatus_output", float, "%.3f" -entry = etbStatus_error, "etbStatus_error", float, "%.3f" -entry = etbStatus_resetCounter, "etbStatus_resetCounter", int, "%d" -entry = boostStatus_pTerm, "boostStatus_pTerm", float, "%.3f" -entry = boostStatus_iTerm, "boostStatus_iTerm", float, "%.3f" -entry = boostStatus_dTerm, "boostStatus_dTerm", float, "%.3f" -entry = boostStatus_output, "boostStatus_output", float, "%.3f" -entry = boostStatus_error, "boostStatus_error", float, "%.3f" -entry = boostStatus_resetCounter, "boostStatus_resetCounter", int, "%d" -entry = wastegateDcStatus_pTerm, "wastegateDcStatus_pTerm", float, "%.3f" -entry = wastegateDcStatus_iTerm, "wastegateDcStatus_iTerm", float, "%.3f" -entry = wastegateDcStatus_dTerm, "wastegateDcStatus_dTerm", float, "%.3f" -entry = wastegateDcStatus_output, "wastegateDcStatus_output", float, "%.3f" -entry = wastegateDcStatus_error, "wastegateDcStatus_error", float, "%.3f" -entry = wastegateDcStatus_resetCounter, "wastegateDcStatus_resetCounter", int, "%d" -entry = auxSpeed1, "Aux speed 1", int, "%d" -entry = auxSpeed2, "Aux speed 2", int, "%d" -entry = ISSValue, "TCU: Input Shaft Speed", int, "%d" -entry = rawAnalogInput1, "rawAnalogInput 1", float, "%.3f" -entry = rawAnalogInput2, "rawAnalogInput 2", float, "%.3f" -entry = rawAnalogInput3, "rawAnalogInput 3", float, "%.3f" -entry = rawAnalogInput4, "rawAnalogInput 4", float, "%.3f" -entry = rawAnalogInput5, "rawAnalogInput 5", float, "%.3f" -entry = rawAnalogInput6, "rawAnalogInput 6", float, "%.3f" -entry = rawAnalogInput7, "rawAnalogInput 7", float, "%.3f" -entry = rawAnalogInput8, "rawAnalogInput 8", float, "%.3f" -entry = gppwmOutput1, "GPPWM Output 1", float, "%.3f" -entry = gppwmOutput2, "GPPWM Output 2", float, "%.3f" -entry = gppwmOutput3, "GPPWM Output 3", float, "%.3f" -entry = gppwmOutput4, "GPPWM Output 4", float, "%.3f" -entry = gppwmXAxis1, "gppwmXAxis 1", int, "%d" -entry = gppwmXAxis2, "gppwmXAxis 2", int, "%d" -entry = gppwmXAxis3, "gppwmXAxis 3", int, "%d" -entry = gppwmXAxis4, "gppwmXAxis 4", int, "%d" -entry = gppwmYAxis1, "gppwmYAxis 1", float, "%.3f" -entry = gppwmYAxis2, "gppwmYAxis 2", float, "%.3f" -entry = gppwmYAxis3, "gppwmYAxis 3", float, "%.3f" -entry = gppwmYAxis4, "gppwmYAxis 4", float, "%.3f" -entry = rawBattery, "rawBattery", float, "%.3f" -entry = ignBlendParameter1, "ignBlendParameter 1", float, "%.3f" -entry = ignBlendParameter2, "ignBlendParameter 2", float, "%.3f" -entry = ignBlendParameter3, "ignBlendParameter 3", float, "%.3f" -entry = ignBlendParameter4, "ignBlendParameter 4", float, "%.3f" -entry = ignBlendBias1, "ignBlendBias 1", float, "%.3f" -entry = ignBlendBias2, "ignBlendBias 2", float, "%.3f" -entry = ignBlendBias3, "ignBlendBias 3", float, "%.3f" -entry = ignBlendBias4, "ignBlendBias 4", float, "%.3f" -entry = ignBlendOutput1, "ignBlendOutput 1", float, "%.3f" -entry = ignBlendOutput2, "ignBlendOutput 2", float, "%.3f" -entry = ignBlendOutput3, "ignBlendOutput 3", float, "%.3f" -entry = ignBlendOutput4, "ignBlendOutput 4", float, "%.3f" -entry = veBlendParameter1, "veBlendParameter 1", float, "%.3f" -entry = veBlendParameter2, "veBlendParameter 2", float, "%.3f" -entry = veBlendParameter3, "veBlendParameter 3", float, "%.3f" -entry = veBlendParameter4, "veBlendParameter 4", float, "%.3f" -entry = veBlendBias1, "veBlendBias 1", float, "%.3f" -entry = veBlendBias2, "veBlendBias 2", float, "%.3f" -entry = veBlendBias3, "veBlendBias 3", float, "%.3f" -entry = veBlendBias4, "veBlendBias 4", float, "%.3f" -entry = veBlendOutput1, "veBlendOutput 1", float, "%.3f" -entry = veBlendOutput2, "veBlendOutput 2", float, "%.3f" -entry = veBlendOutput3, "veBlendOutput 3", float, "%.3f" -entry = veBlendOutput4, "veBlendOutput 4", float, "%.3f" -entry = boostOpenLoopBlendParameter1, "boostOpenLoopBlendParameter 1", float, "%.3f" -entry = boostOpenLoopBlendParameter2, "boostOpenLoopBlendParameter 2", float, "%.3f" -entry = boostOpenLoopBlendBias1, "boostOpenLoopBlendBias 1", float, "%.3f" -entry = boostOpenLoopBlendBias2, "boostOpenLoopBlendBias 2", float, "%.3f" -entry = boostOpenLoopBlendOutput1, "boostOpenLoopBlendOutput 1", int, "%d" -entry = boostOpenLoopBlendOutput2, "boostOpenLoopBlendOutput 2", int, "%d" -entry = boostClosedLoopBlendParameter1, "boostClosedLoopBlendParameter 1", float, "%.3f" -entry = boostClosedLoopBlendParameter2, "boostClosedLoopBlendParameter 2", float, "%.3f" -entry = boostClosedLoopBlendBias1, "boostClosedLoopBlendBias 1", float, "%.3f" -entry = boostClosedLoopBlendBias2, "boostClosedLoopBlendBias 2", float, "%.3f" -entry = boostClosedLoopBlendOutput1, "boostClosedLoopBlendOutput 1", float, "%.3f" -entry = boostClosedLoopBlendOutput2, "boostClosedLoopBlendOutput 2", float, "%.3f" -entry = coilState1, "coilState1", int, "%d" -entry = coilState2, "coilState2", int, "%d" -entry = coilState3, "coilState3", int, "%d" -entry = coilState4, "coilState4", int, "%d" -entry = coilState5, "coilState5", int, "%d" -entry = coilState6, "coilState6", int, "%d" -entry = coilState7, "coilState7", int, "%d" -entry = coilState8, "coilState8", int, "%d" -entry = coilState9, "coilState9", int, "%d" -entry = coilState10, "coilState10", int, "%d" -entry = coilState11, "coilState11", int, "%d" -entry = coilState12, "coilState12", int, "%d" -entry = injectorState1, "injectorState1", int, "%d" -entry = injectorState2, "injectorState2", int, "%d" -entry = injectorState3, "injectorState3", int, "%d" -entry = injectorState4, "injectorState4", int, "%d" -entry = injectorState5, "injectorState5", int, "%d" -entry = injectorState6, "injectorState6", int, "%d" -entry = injectorState7, "injectorState7", int, "%d" -entry = injectorState8, "injectorState8", int, "%d" -entry = injectorState9, "injectorState9", int, "%d" -entry = injectorState10, "injectorState10", int, "%d" -entry = injectorState11, "injectorState11", int, "%d" -entry = injectorState12, "injectorState12", int, "%d" -entry = outputRequestPeriod, "outputRequestPeriod", int, "%d" -entry = mapFast, "mapFast", float, "%.3f" -entry = luaGauges1, "Lua: Gauge 1", float, "%.3f" -entry = luaGauges2, "Lua: Gauge 2", float, "%.3f" -entry = rawMaf2, "rawMaf2", float, "%.3f" -entry = mafMeasured2, "MAF #2", float, "%.3f" -entry = schedulingUsedCount, "schedulingUsedCount", int, "%d" -entry = Gego, "Gego", float, "%.3f" -entry = testBenchIter, "testBenchIter", int, "%d" -entry = oilTemp, "oilTemp", float, "%.3f" -entry = fuelTemp, "fuelTemp", float, "%.3f" -entry = ambientTemp, "ambientTemp", float, "%.3f" -entry = compressorDischargeTemp, "compressorDischargeTemp", float, "%.3f" -entry = compressorDischargePressure, "compressorDischargePressure", float, "%.3f" -entry = throttleInletPressure, "throttleInletPressure", float, "%.3f" -entry = ignitionOnTime, "ignitionOnTime", int, "%d" -entry = engineRunTime, "engineRunTime", int, "%d" -entry = distanceTraveled, "distanceTraveled", float, "%.3f" -entry = afrGasolineScale, "Air/Fuel Ratio (Gas Scale)", float, "%.3f" -entry = afr2GasolineScale, "Air/Fuel Ratio 2 (Gas Scale)", float, "%.3f" -entry = actualLastInjectionStage2, "Fuel: Last inj pulse width stg 2", float, "%.3f" -entry = injectorDutyCycleStage2, "Fuel: injector duty cycle stage 2", float, "%.3f" -entry = totalFuelCorrection, "Fuel: Total correction", float, "%.3f" -entry = running_postCrankingFuelCorrection, "Fuel: Post cranking mult", float, "%.3f" -entry = running_intakeTemperatureCoefficient, "Fuel: IAT correction", float, "%.3f" -entry = running_coolantTemperatureCoefficient, "Fuel: CLT correction", float, "%.3f" -entry = running_timeSinceCrankingInSecs, "running_timeSinceCrankingInSecs", float, "%.3f" -entry = running_baseFuel, "Fuel: base cycle mass", float, "%.3f" -entry = running_fuel, "Fuel: running", float, "%.3f" -entry = afrTableYAxis, "afrTableYAxis", float, "%.3f" -entry = targetLambda, "Fuel: target lambda", float, "%.3f" -entry = targetAFR, "Fuel: target AFR", float, "%.3f" -entry = stoichiometricRatio, "Fuel: Stoich ratio", float, "%.3f" -entry = sdTcharge_coff, "sdTcharge_coff", float, "%.3f" -entry = sdAirMassInOneCylinder, "Air: Cylinder airmass", float, "%.3f" -entry = normalizedCylinderFilling, "Air: Normalized cyl filling", float, "%.3f" -entry = baseDwell, "baseDwell", float, "%.3f" -entry = sparkDwell, "Ign: Dwell", float, "%.3f" -entry = dwellAngle, "ignition dwell duration", float, "%.3f" -entry = cltTimingCorrection, "Ign: CLT correction", float, "%.3f" -entry = timingIatCorrection, "Ign: IAT correction", float, "%.3f" -entry = timingPidCorrection, "Idle: Timing adjustment", float, "%.3f" -entry = dwellVoltageCorrection, "Ign: Dwell voltage correction", float, "%.3f" -entry = luaTimingAdd, "Ign: Lua timing add", float, "%.3f" -entry = luaTimingMult, "Ign: Lua timing mult", float, "%.3f" -entry = m_knockLevel, "Knock: Current level", float, "%.3f" -entry = m_knockCyl1, "Knock: Cyl 1", int, "%d" -entry = m_knockCyl2, "Knock: Cyl 2", int, "%d" -entry = m_knockCyl3, "Knock: Cyl 3", int, "%d" -entry = m_knockCyl4, "Knock: Cyl 4", int, "%d" -entry = m_knockCyl5, "Knock: Cyl 5", int, "%d" -entry = m_knockCyl6, "Knock: Cyl 6", int, "%d" -entry = m_knockCyl7, "Knock: Cyl 7", int, "%d" -entry = m_knockCyl8, "Knock: Cyl 8", int, "%d" -entry = m_knockCyl9, "Knock: Cyl 9", int, "%d" -entry = m_knockCyl10, "Knock: Cyl 10", int, "%d" -entry = m_knockCyl11, "Knock: Cyl 11", int, "%d" -entry = m_knockCyl12, "Knock: Cyl 12", int, "%d" -entry = m_knockRetard, "Knock: Retard", float, "%.3f" -entry = m_knockThreshold, "Knock: Threshold", float, "%.3f" -entry = m_knockCount, "Knock: Count", int, "%d" -entry = m_maximumRetard, "Knock: Max retard", float, "%.3f" -entry = m_requested_pump, "HPFP duration", float, "%.3f" -entry = fuel_requested_percent, "fuel_requested_percent", float, "%.3f" -entry = fuel_requested_percent_pi, "fuel_requested_percent_pi", float, "%.3f" -entry = noValve, "noValve", int, "%d" -entry = angleAboveMin, "angleAboveMin", int, "%d" -entry = isHpfpInactive, "isHpfpInactive", int, "%d" -entry = nextLobe, "nextLobe", float, "%.3f" -entry = di_nextStart, "DI: next start", float, "%.3f" -entry = m_deadtime, "Fuel: injector lag", float, "%.3f" -entry = pressureDelta, "fuel: Injector pressure delta", float, "%.3f" -entry = pressureRatio, "fuel: Injector pressure ratio", float, "%.3f" -entry = retardThresholdRpm, "retardThresholdRpm", int, "%d" -entry = combinedConditions, "combinedConditions", int, "%d" -entry = launchActivatePinState, "launchActivatePinState", int, "%d" -entry = isLaunchCondition, "isLaunchCondition", int, "%d" -entry = isSwitchActivated, "isSwitchActivated", int, "%d" -entry = isClutchActivated, "isClutchActivated", int, "%d" -entry = isValidInputPin, "isValidInputPin", int, "%d" -entry = activateSwitchCondition, "activateSwitchCondition", int, "%d" -entry = rpmCondition, "rpmCondition", int, "%d" -entry = speedCondition, "speedCondition", int, "%d" -entry = tpsCondition, "tpsCondition", int, "%d" -entry = isAntilagCondition, "isAntilagCondition", int, "%d" -entry = ALSMinRPMCondition, "ALSMinRPMCondition", int, "%d" -entry = ALSMaxRPMCondition, "ALSMaxRPMCondition", int, "%d" -entry = ALSMinCLTCondition, "ALSMinCLTCondition", int, "%d" -entry = ALSMaxCLTCondition, "ALSMaxCLTCondition", int, "%d" -entry = ALSMaxThrottleIntentCondition, "ALSMaxThrottleIntentCondition", int, "%d" -entry = isALSSwitchActivated, "isALSSwitchActivated", int, "%d" -entry = ALSActivatePinState, "ALSActivatePinState", int, "%d" -entry = ALSSwitchCondition, "ALSSwitchCondition", int, "%d" -entry = ALSTimerCondition, "ALSTimerCondition", int, "%d" -entry = fuelALSCorrection, "fuelALSCorrection", float, "%.3f" -entry = timingALSCorrection, "timingALSCorrection", float, "%.3f" -entry = isTpsInvalid, "isTpsInvalid", int, "%d" -entry = m_shouldResetPid, "m_shouldResetPid", int, "%d" -entry = isBelowClosedLoopThreshold, "isBelowClosedLoopThreshold", int, "%d" -entry = isNotClosedLoop, "isNotClosedLoop", int, "%d" -entry = isZeroRpm, "isZeroRpm", int, "%d" -entry = hasInitBoost, "hasInitBoost", int, "%d" -entry = rpmTooLow, "rpmTooLow", int, "%d" -entry = tpsTooLow, "tpsTooLow", int, "%d" -entry = mapTooLow, "mapTooLow", int, "%d" -entry = luaTargetAdd, "Boost: Lua target add", float, "%.3f" -entry = boostOutput, "Boost: Output", float, "%.3f" -entry = luaTargetMult, "Boost: Lua target mult", float, "%.3f" -entry = openLoopPart, "Boost: Open loop", float, "%.3f" -entry = luaOpenLoopAdd, "Boost: Lua open loop add", float, "%.3f" -entry = boostControllerClosedLoopPart, "Boost: Closed loop", float, "%.3f" -entry = boostControlTarget, "Boost: Target", float, "%.3f" -entry = acButtonState, "AC switch", int, "%d" -entry = m_acEnabled, "AC enabled", int, "%d" -entry = engineTooSlow, "AC engine too slow", int, "%d" -entry = engineTooFast, "AC engine too fast", int, "%d" -entry = noClt, "AC no CLT", int, "%d" -entry = engineTooHot, "AC engine too hot", int, "%d" -entry = tpsTooHigh, "AC tps too high", int, "%d" -entry = isDisabledByLua, "AC disabled by Lua", int, "%d" -entry = acCompressorState, "AC compressor on", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" -entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" -entry = cranking, "cranking", int, "%d" -entry = notRunning, "notRunning", int, "%d" -entry = disabledWhileEngineStopped, "disabledWhileEngineStopped", int, "%d" -entry = brokenClt, "brokenClt", int, "%d" -entry = enabledForAc, "enabledForAc", int, "%d" -entry = hot, "hot", int, "%d" -entry = cold, "cold", int, "%d" -entry = isPrime, "isPrime", int, "%d" -entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" -entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" -entry = ignitionOn, "ignitionOn", int, "%d" -entry = isBenchTest, "isBenchTest", int, "%d" -entry = hasIgnitionVoltage, "hasIgnitionVoltage", int, "%d" -entry = mainRelayState, "mainRelayState", int, "%d" -entry = delayedShutoffRequested, "delayedShutoffRequested", int, "%d" -entry = lua_fuelAdd, "Lua: Fuel add", float, "%.3f" -entry = lua_fuelMult, "Lua: Fuel mult", float, "%.3f" -entry = lua_clutchUpState, "lua_clutchUpState", int, "%d" -entry = lua_brakePedalState, "lua_brakePedalState", int, "%d" -entry = lua_acRequestState, "lua_acRequestState", int, "%d" -entry = lua_luaDisableEtb, "lua_luaDisableEtb", int, "%d" -entry = lua_luaIgnCut, "lua_luaIgnCut", int, "%d" -entry = sd_tCharge, "Air: Charge temperature estimate", float, "%.3f" -entry = sd_tChargeK, "Air: Charge temperature estimate K", float, "%.3f" -entry = crankingFuel_coolantTemperatureCoefficient, "Fuel: cranking CLT mult", float, "%.3f" -entry = crankingFuel_tpsCoefficient, "Fuel: cranking TPS mult", float, "%.3f" -entry = crankingFuel_durationCoefficient, "Fuel: cranking duration mult", float, "%.3f" -entry = crankingFuel_fuel, "Fuel: Cranking cycle mass", float, "%.3f" -entry = baroCorrection, "Fuel: Barometric pressure mult", float, "%.3f" -entry = hellenBoardId, "Detected Board ID", int, "%d" -entry = clutchUpState, "Clutch: up", int, "%d" -entry = clutchDownState, "Clutch: down", int, "%d" -entry = brakePedalState, "Brake switch", int, "%d" -entry = startStopState, "startStopState", int, "%d" -entry = startStopStateToggleCounter, "startStopStateToggleCounter", int, "%d" -entry = egtValue1, "egtValue1", float, "%.3f" -entry = egtValue2, "egtValue2", float, "%.3f" -entry = desiredRpmLimit, "User-defined RPM hard limit", int, "%d" -entry = fuelInjectionCounter, "Fuel: Injection counter", int, "%d" -entry = sparkCounter, "Ign: Spark counter", int, "%d" -entry = fuelingLoad, "Fuel: Load", float, "%.3f" -entry = ignitionLoad, "Ign: Load", float, "%.3f" -entry = veTableYAxis, "veTableYAxis", float, "%.3f" -entry = tpsFrom, "Fuel: TPS AE from", float, "%.3f" -entry = tpsTo, "Fuel: TPS AE to", float, "%.3f" -entry = deltaTps, "Fuel: TPS AE change", float, "%.3f" -entry = extraFuel, "extraFuel", float, "%.3f" -entry = valueFromTable, "valueFromTable", float, "%.3f" -entry = isAboveAccelThreshold, "Fuel: TPS AE Active", int, "%d" -entry = isBelowDecelThreshold, "isBelowDecelThreshold", int, "%d" -entry = isTimeToResetAccumulator, "Accel: reset time", int, "%d" -entry = isFractionalEnrichment, "isFractionalEnrichment", int, "%d" -entry = belowEpsilon, "Accel: below threshold", int, "%d" -entry = tooShort, "Accel: too short", int, "%d" -entry = fractionalInjFuel, "fractionalInjFuel", float, "%.3f" -entry = accumulatedValue, "accumulatedValue", float, "%.3f" -entry = maxExtraPerCycle, "maxExtraPerCycle", float, "%.3f" -entry = maxExtraPerPeriod, "maxExtraPerPeriod", float, "%.3f" -entry = maxInjectedPerPeriod, "maxInjectedPerPeriod", float, "%.3f" -entry = cycleCnt, "cycleCnt", int, "%d" -entry = hwEventCounters1, "Hardware events since boot 1", int, "%d" -entry = hwEventCounters2, "Hardware events since boot 2", int, "%d" -entry = hwEventCounters3, "Hardware events since boot 3", int, "%d" -entry = hwEventCounters4, "Hardware events since boot 4", int, "%d" -entry = hwEventCounters5, "Hardware events since boot 5", int, "%d" -entry = hwEventCounters6, "Hardware events since boot 6", int, "%d" -entry = vvtCamCounter, "vvtCamCounter", int, "%d" -entry = mapVvt_MAP_AT_SPECIAL_POINT, "mapVvt_MAP_AT_SPECIAL_POINT", float, "%.3f" -entry = mapVvt_MAP_AT_DIFF, "mapVvt_MAP_AT_DIFF", float, "%.3f" -entry = mapVvt_MAP_AT_CYCLE_COUNT, "mapVvt_MAP_AT_CYCLE_COUNT", int, "%d" -entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" -entry = currentEngineDecodedPhase, "Engine Phase", float, "%.3f" -entry = triggerToothAngleError, "triggerToothAngleError", float, "%.3f" -entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" -entry = crankSynchronizationCounter, "Crank sync counter", int, "%d" -entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" -entry = triggerSyncGapRatio, "Trigger Sync Latest Ratio", float, "%.3f" -entry = triggerStateIndex, "triggerStateIndex", int, "%d" -entry = vvtCounter, "vvtCounter", int, "%d" -entry = vvtStateIndex, "vvtStateIndex", int, "%d" -entry = camResyncCounter, "camResyncCounter", int, "%d" -entry = m_hasSynchronizedPhase, "m_hasSynchronizedPhase", int, "%d" -entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" -entry = wallFuel, "Fuel on the wall", float, "%.3f" -entry = idleState, "idleState", int, "%d" -entry = currentIdlePosition, "Idle: Position", float, "%.3f" -entry = baseIdlePosition, "Idle: Open loop", float, "%.3f" -entry = idleClosedLoop, "Idle: Closed loop", float, "%.3f" -entry = iacByTpsTaper, "Idle: iacByTpsTaper portion", float, "%.3f" -entry = throttlePedalUpState, "Idle: throttlePedalUpState", int, "%d" -entry = mightResetPid, "Idle: mightResetPid", int, "%d" -entry = shouldResetPid, "Idle: shouldResetPid", int, "%d" -entry = wasResetPid, "Idle: wasResetPid", int, "%d" -entry = mustResetPid, "Idle: mustResetPid", int, "%d" -entry = isCranking, "Idle: cranking", int, "%d" -entry = isIacTableForCoasting, "isIacTableForCoasting", int, "%d" -entry = notIdling, "notIdling", int, "%d" -entry = needReset, "Idle: reset", int, "%d" -entry = isInDeadZone, "Idle: dead zone", int, "%d" -entry = isBlipping, "isBlipping", int, "%d" -entry = looksLikeRunning, "looksLikeRunning", int, "%d" -entry = looksLikeCoasting, "looksLikeCoasting", int, "%d" -entry = looksLikeCrankToIdle, "looksLikeCrankToIdle", int, "%d" -entry = isIdleCoasting, "Idle: coasting", int, "%d" -entry = isIdleClosedLoop, "Idle: Closed loop active", int, "%d" -entry = idleTarget, "Idle: Target RPM", int, "%d" -entry = targetRpmByClt, "Idle: Target RPM base", int, "%d" -entry = targetRpmAcBump, "Idle: Target A/C bump", int, "%d" -entry = iacByRpmTaper, "Idle: iacByRpmTaper portion", float, "%.3f" -entry = luaAdd, "Idle: Lua Adder", float, "%.3f" -entry = idlePosition, "ETB: idlePosition", float, "%.3f" -entry = trim, "ETB: trim", float, "%.3f" -entry = luaAdjustment, "ETB: luaAdjustment", float, "%.3f" -entry = m_wastegatePosition, "DC: wastegatePosition", float, "%.3f" -entry = etbFeedForward, "etbFeedForward", float, "%.3f" -entry = etbIntegralError, "etbIntegralError", float, "%.3f" -entry = etbCurrentTarget, "etbCurrentTarget", float, "%.3f" -entry = etbCurrentAdjustedTarget, "etbCurrentAdjustedTarget", float, "%.3f" -entry = etbRevLimitActive, "etbRevLimitActive", int, "%d" -entry = jamDetected, "jamDetected", int, "%d" -entry = etbDutyRateOfChange, "ETB duty rate of change", float, "%.3f" -entry = etbDutyAverage, "ETB average duty", float, "%.3f" -entry = etbTpsErrorCounter, "ETB TPS error counter", int, "%d" -entry = etbPpsErrorCounter, "ETB pedal error counter", int, "%d" -entry = etbErrorCode, "etbErrorCode", int, "%d" -entry = jamTimer, "ETB jam timer", float, "%.3f" -entry = faultCode, "WBO: Fault code", int, "%d" -entry = heaterDuty, "WBO: Heater duty", int, "%d" -entry = pumpDuty, "WBO: Pump duty", int, "%d" -entry = tempC, "WBO: Temperature", int, "%d" -entry = nernstVoltage, "WBO: Nernst Voltage", float, "%.3f" -entry = esr, "WBO: ESR", int, "%d" -entry = dcOutput0, "DC: output0", float, "%.3f" -entry = isEnabled0_int, "DC: en0", int, "%d" -entry = isEnabled0, "isEnabled0", int, "%d" -entry = value0, "ETB: SENT value0", int, "%d" -entry = value1, "ETB: SENT value1", int, "%d" -entry = errorRate, "ETB: SENT error rate", float, "%.3f" -entry = throttleUseWotModel, "Air: Throttle model WOT", int, "%d" -entry = throttleModelCrossoverAngle, "Air: Throttle crossover pos", float, "%.3f" -entry = throttleEstimatedFlow, "Air: Throttle flow estimate", float, "%.3f" -entry = vvtTarget, "vvtTarget", float, "%.3f" -entry = vvtOutput, "vvtOutput", float, "%.3f" -entry = lambdaCurrentlyGood, "lambdaCurrentlyGood", int, "%d" -entry = lambdaMonitorCut, "lambdaMonitorCut", int, "%d" -entry = lambdaTimeSinceGood, "lambdaTimeSinceGood", float, "%.3f" diff --git a/firmware/tunerstudio/generated/temp/fancy_content.ini b/firmware/tunerstudio/generated/temp/fancy_content.ini deleted file mode 100644 index f7d7683886..0000000000 --- a/firmware/tunerstudio/generated/temp/fancy_content.ini +++ /dev/null @@ -1,407 +0,0 @@ - -dialog = fuel_computerDialog, "fuel_computer" - liveGraph = fuel_computer_1_Graph, "Graph", South - graphLine = totalFuelCorrection - graphLine = running_postCrankingFuelCorrection - graphLine = running_intakeTemperatureCoefficient - graphLine = running_coolantTemperatureCoefficient - liveGraph = fuel_computer_2_Graph, "Graph", South - graphLine = running_timeSinceCrankingInSecs - graphLine = running_baseFuel - graphLine = running_fuel - graphLine = afrTableYAxis - liveGraph = fuel_computer_3_Graph, "Graph", South - graphLine = targetLambda - graphLine = targetAFR - graphLine = stoichiometricRatio - graphLine = sdTcharge_coff - liveGraph = fuel_computer_4_Graph, "Graph", South - graphLine = sdAirMassInOneCylinder - graphLine = normalizedCylinderFilling - - -dialog = ignition_stateDialog, "ignition_state" - liveGraph = ignition_state_1_Graph, "Graph", South - graphLine = baseDwell - graphLine = sparkDwell - graphLine = dwellAngle - graphLine = cltTimingCorrection - liveGraph = ignition_state_2_Graph, "Graph", South - graphLine = timingIatCorrection - graphLine = timingPidCorrection - graphLine = dwellVoltageCorrection - graphLine = luaTimingAdd - liveGraph = ignition_state_3_Graph, "Graph", South - graphLine = luaTimingMult - - -dialog = knock_controllerDialog, "knock_controller" - liveGraph = knock_controller_1_Graph, "Graph", South - graphLine = m_knockLevel - graphLine = m_knockCyl1 - graphLine = m_knockCyl2 - graphLine = m_knockCyl3 - liveGraph = knock_controller_2_Graph, "Graph", South - graphLine = m_knockCyl4 - graphLine = m_knockCyl5 - graphLine = m_knockCyl6 - graphLine = m_knockCyl7 - liveGraph = knock_controller_3_Graph, "Graph", South - graphLine = m_knockCyl8 - graphLine = m_knockCyl9 - graphLine = m_knockCyl10 - graphLine = m_knockCyl11 - liveGraph = knock_controller_4_Graph, "Graph", South - graphLine = m_knockCyl12 - graphLine = m_knockRetard - graphLine = m_knockThreshold - graphLine = m_knockCount - liveGraph = knock_controller_5_Graph, "Graph", South - graphLine = m_maximumRetard - -indicatorPanel = high_pressure_fuel_pumpIndicatorPanel, 2 - indicator = {noValve}, "noValve No", "noValve Yes" - indicator = {angleAboveMin}, "angleAboveMin No", "angleAboveMin Yes" - indicator = {isHpfpInactive}, "isHpfpInactive No", "isHpfpInactive Yes" - -dialog = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - panel = high_pressure_fuel_pumpIndicatorPanel - liveGraph = high_pressure_fuel_pump_1_Graph, "Graph", South - graphLine = m_requested_pump - graphLine = fuel_requested_percent - graphLine = fuel_requested_percent_pi - graphLine = nextLobe - liveGraph = high_pressure_fuel_pump_2_Graph, "Graph", South - graphLine = di_nextStart - - -dialog = injector_modelDialog, "injector_model" - liveGraph = injector_model_1_Graph, "Graph", South - graphLine = m_deadtime - graphLine = pressureDelta - graphLine = pressureRatio - -indicatorPanel = launch_control_stateIndicatorPanel, 2 - indicator = {combinedConditions}, "combinedConditions No", "combinedConditions Yes" - indicator = {launchActivatePinState}, "launchActivatePinState No", "launchActivatePinState Yes" - indicator = {isLaunchCondition}, "isLaunchCondition No", "isLaunchCondition Yes" - indicator = {isSwitchActivated}, "isSwitchActivated No", "isSwitchActivated Yes" - indicator = {isClutchActivated}, "isClutchActivated No", "isClutchActivated Yes" - indicator = {isValidInputPin}, "isValidInputPin No", "isValidInputPin Yes" - indicator = {activateSwitchCondition}, "activateSwitchCondition No", "activateSwitchCondition Yes" - indicator = {rpmCondition}, "rpmCondition No", "rpmCondition Yes" - indicator = {speedCondition}, "speedCondition No", "speedCondition Yes" - indicator = {tpsCondition}, "tpsCondition No", "tpsCondition Yes" - -dialog = launch_control_stateDialog, "launch_control_state" - panel = launch_control_stateIndicatorPanel - liveGraph = launch_control_state_1_Graph, "Graph", South - graphLine = retardThresholdRpm - -indicatorPanel = antilag_system_stateIndicatorPanel, 2 - indicator = {isAntilagCondition}, "isAntilagCondition No", "isAntilagCondition Yes" - indicator = {ALSMinRPMCondition}, "ALSMinRPMCondition No", "ALSMinRPMCondition Yes" - indicator = {ALSMaxRPMCondition}, "ALSMaxRPMCondition No", "ALSMaxRPMCondition Yes" - indicator = {ALSMinCLTCondition}, "ALSMinCLTCondition No", "ALSMinCLTCondition Yes" - indicator = {ALSMaxCLTCondition}, "ALSMaxCLTCondition No", "ALSMaxCLTCondition Yes" - indicator = {ALSMaxThrottleIntentCondition}, "ALSMaxThrottleIntentCondition No", "ALSMaxThrottleIntentCondition Yes" - indicator = {isALSSwitchActivated}, "isALSSwitchActivated No", "isALSSwitchActivated Yes" - indicator = {ALSActivatePinState}, "ALSActivatePinState No", "ALSActivatePinState Yes" - indicator = {ALSSwitchCondition}, "ALSSwitchCondition No", "ALSSwitchCondition Yes" - indicator = {ALSTimerCondition}, "ALSTimerCondition No", "ALSTimerCondition Yes" - -dialog = antilag_system_stateDialog, "antilag_system_state" - panel = antilag_system_stateIndicatorPanel - liveGraph = antilag_system_state_1_Graph, "Graph", South - graphLine = fuelALSCorrection - graphLine = timingALSCorrection - -indicatorPanel = boost_controlIndicatorPanel, 2 - indicator = {isTpsInvalid}, "isTpsInvalid No", "isTpsInvalid Yes" - indicator = {m_shouldResetPid}, "m_shouldResetPid No", "m_shouldResetPid Yes" - indicator = {isBelowClosedLoopThreshold}, "isBelowClosedLoopThreshold No", "isBelowClosedLoopThreshold Yes" - indicator = {isNotClosedLoop}, "isNotClosedLoop No", "isNotClosedLoop Yes" - indicator = {isZeroRpm}, "isZeroRpm No", "isZeroRpm Yes" - indicator = {hasInitBoost}, "hasInitBoost No", "hasInitBoost Yes" - indicator = {rpmTooLow}, "rpmTooLow No", "rpmTooLow Yes" - indicator = {tpsTooLow}, "tpsTooLow No", "tpsTooLow Yes" - indicator = {mapTooLow}, "mapTooLow No", "mapTooLow Yes" - -dialog = boost_controlDialog, "boost_control" - panel = boost_controlIndicatorPanel - liveGraph = boost_control_1_Graph, "Graph", South - graphLine = luaTargetAdd - graphLine = boostOutput - graphLine = luaTargetMult - graphLine = openLoopPart - liveGraph = boost_control_2_Graph, "Graph", South - graphLine = luaOpenLoopAdd - graphLine = boostControllerClosedLoopPart - graphLine = boostControlTarget - -indicatorPanel = ac_controlIndicatorPanel, 2 - indicator = {acButtonState}, "acButtonState No", "acButtonState Yes" - indicator = {m_acEnabled}, "m_acEnabled No", "m_acEnabled Yes" - indicator = {engineTooSlow}, "engineTooSlow No", "engineTooSlow Yes" - indicator = {engineTooFast}, "engineTooFast No", "engineTooFast Yes" - indicator = {noClt}, "noClt No", "noClt Yes" - indicator = {engineTooHot}, "engineTooHot No", "engineTooHot Yes" - indicator = {tpsTooHigh}, "tpsTooHigh No", "tpsTooHigh Yes" - indicator = {isDisabledByLua}, "isDisabledByLua No", "isDisabledByLua Yes" - indicator = {acCompressorState}, "acCompressorState No", "acCompressorState Yes" - -dialog = ac_controlDialog, "ac_control" - panel = ac_controlIndicatorPanel - liveGraph = ac_control_1_Graph, "Graph", South - graphLine = latest_usage_ac_control - graphLine = acSwitchLastChangeTimeMs - -indicatorPanel = fan_controlIndicatorPanel, 2 - indicator = {cranking}, "cranking No", "cranking Yes" - indicator = {notRunning}, "notRunning No", "notRunning Yes" - indicator = {disabledWhileEngineStopped}, "disabledWhileEngineStopped No", "disabledWhileEngineStopped Yes" - indicator = {brokenClt}, "brokenClt No", "brokenClt Yes" - indicator = {enabledForAc}, "enabledForAc No", "enabledForAc Yes" - indicator = {hot}, "hot No", "hot Yes" - indicator = {cold}, "cold No", "cold Yes" - -dialog = fan_controlDialog, "fan_control" - panel = fan_controlIndicatorPanel - -indicatorPanel = fuel_pump_controlIndicatorPanel, 2 - indicator = {isPrime}, "isPrime No", "isPrime Yes" - indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" - indicator = {isFuelPumpOn}, "isFuelPumpOn No", "isFuelPumpOn Yes" - indicator = {ignitionOn}, "ignitionOn No", "ignitionOn Yes" - -dialog = fuel_pump_controlDialog, "fuel_pump_control" - panel = fuel_pump_controlIndicatorPanel - -indicatorPanel = main_relayIndicatorPanel, 2 - indicator = {isBenchTest}, "isBenchTest No", "isBenchTest Yes" - indicator = {hasIgnitionVoltage}, "hasIgnitionVoltage No", "hasIgnitionVoltage Yes" - indicator = {mainRelayState}, "mainRelayState No", "mainRelayState Yes" - indicator = {delayedShutoffRequested}, "delayedShutoffRequested No", "delayedShutoffRequested Yes" - -dialog = main_relayDialog, "main_relay" - panel = main_relayIndicatorPanel - -indicatorPanel = engine_stateIndicatorPanel, 2 - indicator = {lua_clutchUpState}, "clutchUpState No", "clutchUpState Yes" - indicator = {lua_brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {lua_acRequestState}, "acRequestState No", "acRequestState Yes" - indicator = {lua_luaDisableEtb}, "luaDisableEtb No", "luaDisableEtb Yes" - indicator = {lua_luaIgnCut}, "luaIgnCut No", "luaIgnCut Yes" - indicator = {clutchUpState}, "clutchUpState No", "clutchUpState Yes" - indicator = {clutchDownState}, "clutchDownState No", "clutchDownState Yes" - indicator = {brakePedalState}, "brakePedalState No", "brakePedalState Yes" - indicator = {startStopState}, "startStopState No", "startStopState Yes" - -dialog = engine_stateDialog, "engine_state" - panel = engine_stateIndicatorPanel - liveGraph = engine_state_1_Graph, "Graph", South - graphLine = lua_fuelAdd - graphLine = lua_fuelMult - graphLine = sd_tCharge - graphLine = sd_tChargeK - liveGraph = engine_state_2_Graph, "Graph", South - graphLine = crankingFuel_coolantTemperatureCoefficient - graphLine = crankingFuel_tpsCoefficient - graphLine = crankingFuel_durationCoefficient - graphLine = crankingFuel_fuel - liveGraph = engine_state_3_Graph, "Graph", South - graphLine = baroCorrection - graphLine = hellenBoardId - graphLine = startStopStateToggleCounter - graphLine = egtValue1 - liveGraph = engine_state_4_Graph, "Graph", South - graphLine = egtValue2 - graphLine = desiredRpmLimit - graphLine = fuelInjectionCounter - graphLine = sparkCounter - liveGraph = engine_state_5_Graph, "Graph", South - graphLine = fuelingLoad - graphLine = ignitionLoad - graphLine = veTableYAxis - -indicatorPanel = tps_accel_stateIndicatorPanel, 2 - indicator = {isAboveAccelThreshold}, "isAboveAccelThreshold No", "isAboveAccelThreshold Yes" - indicator = {isBelowDecelThreshold}, "isBelowDecelThreshold No", "isBelowDecelThreshold Yes" - indicator = {isTimeToResetAccumulator}, "isTimeToResetAccumulator No", "isTimeToResetAccumulator Yes" - indicator = {isFractionalEnrichment}, "isFractionalEnrichment No", "isFractionalEnrichment Yes" - indicator = {belowEpsilon}, "belowEpsilon No", "belowEpsilon Yes" - indicator = {tooShort}, "tooShort No", "tooShort Yes" - -dialog = tps_accel_stateDialog, "tps_accel_state" - panel = tps_accel_stateIndicatorPanel - liveGraph = tps_accel_state_1_Graph, "Graph", South - graphLine = tpsFrom - graphLine = tpsTo - graphLine = deltaTps - graphLine = extraFuel - liveGraph = tps_accel_state_2_Graph, "Graph", South - graphLine = valueFromTable - graphLine = fractionalInjFuel - graphLine = accumulatedValue - graphLine = maxExtraPerCycle - liveGraph = tps_accel_state_3_Graph, "Graph", South - graphLine = maxExtraPerPeriod - graphLine = maxInjectedPerPeriod - graphLine = cycleCnt - - -dialog = trigger_centralDialog, "trigger_central" - liveGraph = trigger_central_1_Graph, "Graph", South - graphLine = hwEventCounters1 - graphLine = hwEventCounters2 - graphLine = hwEventCounters3 - graphLine = hwEventCounters4 - liveGraph = trigger_central_2_Graph, "Graph", South - graphLine = hwEventCounters5 - graphLine = hwEventCounters6 - graphLine = vvtCamCounter - graphLine = mapVvt_MAP_AT_SPECIAL_POINT - liveGraph = trigger_central_3_Graph, "Graph", South - graphLine = mapVvt_MAP_AT_DIFF - graphLine = mapVvt_MAP_AT_CYCLE_COUNT - graphLine = mapVvt_map_peak - graphLine = currentEngineDecodedPhase - liveGraph = trigger_central_4_Graph, "Graph", South - graphLine = triggerToothAngleError - graphLine = triggerIgnoredToothCount - - -dialog = trigger_stateDialog, "trigger_state" - liveGraph = trigger_state_1_Graph, "Graph", South - graphLine = crankSynchronizationCounter - graphLine = vvtSyncGapRatio - graphLine = triggerSyncGapRatio - graphLine = triggerStateIndex - liveGraph = trigger_state_2_Graph, "Graph", South - graphLine = vvtCounter - graphLine = vvtStateIndex - -indicatorPanel = trigger_state_primaryIndicatorPanel, 2 - indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" - -dialog = trigger_state_primaryDialog, "trigger_state_primary" - panel = trigger_state_primaryIndicatorPanel - liveGraph = trigger_state_primary_1_Graph, "Graph", South - graphLine = camResyncCounter - - -dialog = wall_fuel_stateDialog, "wall_fuel_state" - liveGraph = wall_fuel_state_1_Graph, "Graph", South - graphLine = wallFuelCorrection - graphLine = wallFuel - -indicatorPanel = idle_stateIndicatorPanel, 2 - indicator = {mightResetPid}, "mightResetPid No", "mightResetPid Yes" - indicator = {shouldResetPid}, "shouldResetPid No", "shouldResetPid Yes" - indicator = {wasResetPid}, "wasResetPid No", "wasResetPid Yes" - indicator = {mustResetPid}, "mustResetPid No", "mustResetPid Yes" - indicator = {isCranking}, "isCranking No", "isCranking Yes" - indicator = {isIacTableForCoasting}, "isIacTableForCoasting No", "isIacTableForCoasting Yes" - indicator = {notIdling}, "notIdling No", "notIdling Yes" - indicator = {needReset}, "needReset No", "needReset Yes" - indicator = {isInDeadZone}, "isInDeadZone No", "isInDeadZone Yes" - indicator = {isBlipping}, "isBlipping No", "isBlipping Yes" - indicator = {looksLikeRunning}, "looksLikeRunning No", "looksLikeRunning Yes" - indicator = {looksLikeCoasting}, "looksLikeCoasting No", "looksLikeCoasting Yes" - indicator = {looksLikeCrankToIdle}, "looksLikeCrankToIdle No", "looksLikeCrankToIdle Yes" - indicator = {isIdleCoasting}, "isIdleCoasting No", "isIdleCoasting Yes" - indicator = {isIdleClosedLoop}, "isIdleClosedLoop No", "isIdleClosedLoop Yes" - -dialog = idle_stateDialog, "idle_state" - panel = idle_stateIndicatorPanel - liveGraph = idle_state_1_Graph, "Graph", South - graphLine = idleState - graphLine = currentIdlePosition - graphLine = baseIdlePosition - graphLine = idleClosedLoop - liveGraph = idle_state_2_Graph, "Graph", South - graphLine = iacByTpsTaper - graphLine = throttlePedalUpState - graphLine = idleTarget - graphLine = targetRpmByClt - liveGraph = idle_state_3_Graph, "Graph", South - graphLine = targetRpmAcBump - graphLine = iacByRpmTaper - graphLine = luaAdd - -indicatorPanel = electronic_throttleIndicatorPanel, 2 - indicator = {etbRevLimitActive}, "etbRevLimitActive No", "etbRevLimitActive Yes" - indicator = {jamDetected}, "jamDetected No", "jamDetected Yes" - -dialog = electronic_throttleDialog, "electronic_throttle" - panel = electronic_throttleIndicatorPanel - liveGraph = electronic_throttle_1_Graph, "Graph", South - graphLine = idlePosition - graphLine = trim - graphLine = luaAdjustment - graphLine = m_wastegatePosition - liveGraph = electronic_throttle_2_Graph, "Graph", South - graphLine = etbFeedForward - graphLine = etbIntegralError - graphLine = etbCurrentTarget - graphLine = etbCurrentAdjustedTarget - liveGraph = electronic_throttle_3_Graph, "Graph", South - graphLine = etbDutyRateOfChange - graphLine = etbDutyAverage - graphLine = etbTpsErrorCounter - graphLine = etbPpsErrorCounter - liveGraph = electronic_throttle_4_Graph, "Graph", South - graphLine = etbErrorCode - graphLine = jamTimer - - -dialog = wideband_stateDialog, "wideband_state" - liveGraph = wideband_state_1_Graph, "Graph", South - graphLine = faultCode - graphLine = heaterDuty - graphLine = pumpDuty - graphLine = tempC - liveGraph = wideband_state_2_Graph, "Graph", South - graphLine = nernstVoltage - graphLine = esr - -indicatorPanel = dc_motorsIndicatorPanel, 2 - indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" - -dialog = dc_motorsDialog, "dc_motors" - panel = dc_motorsIndicatorPanel - liveGraph = dc_motors_1_Graph, "Graph", South - graphLine = dcOutput0 - graphLine = isEnabled0_int - - -dialog = sent_stateDialog, "sent_state" - liveGraph = sent_state_1_Graph, "Graph", South - graphLine = value0 - graphLine = value1 - graphLine = errorRate - -indicatorPanel = throttle_modelIndicatorPanel, 2 - indicator = {throttleUseWotModel}, "throttleUseWotModel No", "throttleUseWotModel Yes" - -dialog = throttle_modelDialog, "throttle_model" - panel = throttle_modelIndicatorPanel - liveGraph = throttle_model_1_Graph, "Graph", South - graphLine = throttleModelCrossoverAngle - graphLine = throttleEstimatedFlow - - -dialog = vvtDialog, "vvt" - liveGraph = vvt_1_Graph, "Graph", South - graphLine = vvtTarget - graphLine = vvtOutput - -indicatorPanel = lambda_monitorIndicatorPanel, 2 - indicator = {lambdaCurrentlyGood}, "lambdaCurrentlyGood No", "lambdaCurrentlyGood Yes" - indicator = {lambdaMonitorCut}, "lambdaMonitorCut No", "lambdaMonitorCut Yes" - -dialog = lambda_monitorDialog, "lambda_monitor" - panel = lambda_monitorIndicatorPanel - liveGraph = lambda_monitor_1_Graph, "Graph", South - graphLine = lambdaTimeSinceGood - diff --git a/firmware/tunerstudio/generated/temp/fancy_menu.ini b/firmware/tunerstudio/generated/temp/fancy_menu.ini deleted file mode 100644 index 993dc18011..0000000000 --- a/firmware/tunerstudio/generated/temp/fancy_menu.ini +++ /dev/null @@ -1,26 +0,0 @@ - subMenu = fuel_computerDialog, "fuel_computer" - subMenu = ignition_stateDialog, "ignition_state" - subMenu = knock_controllerDialog, "knock_controller" - subMenu = high_pressure_fuel_pumpDialog, "high_pressure_fuel_pump" - subMenu = injector_modelDialog, "injector_model" - subMenu = launch_control_stateDialog, "launch_control_state" - subMenu = antilag_system_stateDialog, "antilag_system_state" - subMenu = boost_controlDialog, "boost_control" - subMenu = ac_controlDialog, "ac_control" - subMenu = fan_controlDialog, "fan_control" - subMenu = fuel_pump_controlDialog, "fuel_pump_control" - subMenu = main_relayDialog, "main_relay" - subMenu = engine_stateDialog, "engine_state" - subMenu = tps_accel_stateDialog, "tps_accel_state" - subMenu = trigger_centralDialog, "trigger_central" - subMenu = trigger_stateDialog, "trigger_state" - subMenu = trigger_state_primaryDialog, "trigger_state_primary" - subMenu = wall_fuel_stateDialog, "wall_fuel_state" - subMenu = idle_stateDialog, "idle_state" - subMenu = electronic_throttleDialog, "electronic_throttle" - subMenu = wideband_stateDialog, "wideband_state" - subMenu = dc_motorsDialog, "dc_motors" - subMenu = sent_stateDialog, "sent_state" - subMenu = throttle_modelDialog, "throttle_model" - subMenu = vvtDialog, "vvt" - subMenu = lambda_monitorDialog, "lambda_monitor" diff --git a/firmware/tunerstudio/generated/temp/output_channels.ini b/firmware/tunerstudio/generated/temp/output_channels.ini deleted file mode 100644 index d934ffd47d..0000000000 --- a/firmware/tunerstudio/generated/temp/output_channels.ini +++ /dev/null @@ -1,744 +0,0 @@ -sd_present = bits, U32, 0, [0:0] -sd_logging_internal = bits, U32, 0, [1:1] -triggerScopeReady = bits, U32, 0, [2:2] -antilagTriggered = bits, U32, 0, [3:3] -isFanOn = bits, U32, 0, [4:4] -isO2HeaterOn = bits, U32, 0, [5:5] -checkEngine = bits, U32, 0, [6:6] -needBurn = bits, U32, 0, [7:7] -sd_msd = bits, U32, 0, [8:8] -isFan2On = bits, U32, 0, [9:9] -acrActive = bits, U32, 0, [10:10] -toothLogReady = bits, U32, 0, [11:11] -isTpsError = bits, U32, 0, [12:12] -isCltError = bits, U32, 0, [13:13] -isMapError = bits, U32, 0, [14:14] -isIatError = bits, U32, 0, [15:15] -isTriggerError = bits, U32, 0, [16:16] -hasCriticalError = bits, U32, 0, [17:17] -isWarnNow = bits, U32, 0, [18:18] -isPedalError = bits, U32, 0, [19:19] -launchTriggered = bits, U32, 0, [20:20] -isTps2Error = bits, U32, 0, [21:21] -injectorFault = bits, U32, 0, [22:22] -ignitionFault = bits, U32, 0, [23:23] -isMainRelayOn = bits, U32, 0, [24:24] -isUsbConnected = bits, U32, 0, [25:25] -dfcoActive = bits, U32, 0, [26:26] -RPMValue = scalar, U16, 4, "RPM", 1, 0 -rpmAcceleration = scalar, S16, 6, "RPM acceleration", 1, 0 -speedToRpmRatio = scalar, U16, 8, "value", 0.01, 0 -vehicleSpeedKph = scalar, U08, 10, "kph", 1, 0 -internalMcuTemperature = scalar, S08, 11, "deg C", 1, 0 -coolant = scalar, S16, 12, "deg C", 0.01, 0 -intake = scalar, S16, 14, "deg C", 0.01, 0 -auxTemp1 = scalar, S16, 16, "deg C", 0.01, 0 -auxTemp2 = scalar, S16, 18, "deg C", 0.01, 0 -TPSValue = scalar, S16, 20, "%", 0.01, 0 -throttlePedalPosition = scalar, S16, 22, "%", 0.01, 0 -tpsADC = scalar, U16, 24, "ADC", 1, 0 -rawMaf = scalar, U16, 26, "V", 0.001, 0 -mafMeasured = scalar, U16, 28, "kg/h", 0.1, 0 -MAPValue = scalar, U16, 30, "kPa", 0.03333333333333333, 0 -baroPressure = scalar, U16, 32, "kPa", 0.03333333333333333, 0 -lambdaValue = scalar, U16, 34, "", 1.0E-4, 0 -VBatt = scalar, U16, 36, "V", 0.001, 0 -oilPressure = scalar, U16, 38, "kPa", 0.03333333333333333, 0 -vvtPositionB1I = scalar, S16, 40, "deg", 0.02, 0 -actualLastInjection = scalar, U16, 42, "ms", 0.0033333333333333335, 0 -injectorDutyCycle = scalar, U08, 44, "%", 0.5, 0 -veValue = scalar, U08, 45, "ratio", 0.5, 0 -injectionOffset = scalar, S16, 46, "deg", 1, 0 -engineMakeCodeNameCrc16 = scalar, U16, 48, "crc16", 1, 0 -wallFuelAmount = scalar, U16, 50, "mg", 0.01, 0 -wallFuelCorrectionValue = scalar, S16, 52, "mg", 0.01, 0 -revolutionCounterSinceStart = scalar, U16, 54, "", 1, 0 -canReadCounter = scalar, U16, 56, "", 1, 0 -tpsAccelFuel = scalar, S16, 58, "ms", 0.0033333333333333335, 0 -ignitionAdvance = scalar, S16, 60, "deg", 0.02, 0 -currentIgnitionMode = scalar, U08, 62, "", 1, 0 -currentInjectionMode = scalar, U08, 63, "", 1, 0 -coilDutyCycle = scalar, U16, 64, "%", 0.01, 0 -etbTarget = scalar, S16, 66, "%", 0.01, 0 -etb1DutyCycle = scalar, S16, 68, "%", 0.01, 0 -fuelTankLevel = scalar, S16, 70, "%", 0.01, 0 -totalFuelConsumption = scalar, U16, 72, "grams", 1, 0 -fuelFlowRate = scalar, U16, 74, "gram/s", 0.005, 0 -TPS2Value = scalar, S16, 76, "%", 0.01, 0 -tuneCrc16 = scalar, U16, 78, "crc16", 1, 0 -seconds = scalar, U32, 80, "sec", 1, 0 -engineMode = scalar, U32, 84, "em", 1, 0 -firmwareVersion = scalar, U32, 88, "version_f", 1, 0 -rawWastegatePosition = scalar, S16, 92, "V", 0.001, 0 -accelerationLat = scalar, S16, 94, "G", 0.001, 0 -accelerationLon = scalar, S16, 96, "G", 0.001, 0 -detectedGear = scalar, U08, 98, "", 1, 0 -maxTriggerReentrant = scalar, U08, 99, "", 1, 0 -rawLowFuelPressure = scalar, S16, 100, "V", 0.001, 0 -rawHighFuelPressure = scalar, S16, 102, "V", 0.001, 0 -lowFuelPressure = scalar, S16, 104, "kpa", 0.03333333333333333, 0 -highFuelPressure = scalar, S16, 106, "bar", 0.1, 0 -rawPpsSecondary = scalar, S16, 108, "V", 0.001, 0 -tcuDesiredGear = scalar, S08, 110, "gear", 1, 0 -flexPercent = scalar, U08, 111, "%", 0.5, 0 -wastegatePositionSensor = scalar, S16, 112, "%", 0.01, 0 -calibrationValue = scalar, F32, 116, "", 1, 0 -calibrationMode = scalar, U08, 120, "", 1, 0 -idleStepperTargetPosition = scalar, U08, 121, "", 1, 0 -tsConfigVersion = scalar, U32, 124, "", 1, 0 -totalTriggerErrorCounter = scalar, U32, 128, "counter", 1, 0 -orderingErrorCounter = scalar, U32, 132, "", 1, 0 -warningCounter = scalar, U16, 136, "count", 1, 0 -lastErrorCode = scalar, U16, 138, "error", 1, 0 -recentErrorCode1 = scalar, U16, 140, "error", 1, 0 -recentErrorCode2 = scalar, U16, 142, "error", 1, 0 -recentErrorCode3 = scalar, U16, 144, "error", 1, 0 -recentErrorCode4 = scalar, U16, 146, "error", 1, 0 -recentErrorCode5 = scalar, U16, 148, "error", 1, 0 -recentErrorCode6 = scalar, U16, 150, "error", 1, 0 -recentErrorCode7 = scalar, U16, 152, "error", 1, 0 -recentErrorCode8 = scalar, U16, 154, "error", 1, 0 -debugFloatField1 = scalar, F32, 156, "val", 1, 0 -debugFloatField2 = scalar, F32, 160, "val", 1, 0 -debugFloatField3 = scalar, F32, 164, "val", 1, 0 -debugFloatField4 = scalar, F32, 168, "val", 1, 0 -debugFloatField5 = scalar, F32, 172, "val", 1, 0 -debugFloatField6 = scalar, F32, 176, "val", 1, 0 -debugFloatField7 = scalar, F32, 180, "val", 1, 0 -debugIntField1 = scalar, U32, 184, "val", 1, 0 -debugIntField2 = scalar, U32, 188, "val", 1, 0 -debugIntField3 = scalar, U32, 192, "val", 1, 0 -debugIntField4 = scalar, S16, 196, "val", 1, 0 -debugIntField5 = scalar, S16, 198, "val", 1, 0 -egt1 = scalar, U16, 200, "deg C", 1, 0 -egt2 = scalar, U16, 202, "deg C", 1, 0 -egt3 = scalar, U16, 204, "deg C", 1, 0 -egt4 = scalar, U16, 206, "deg C", 1, 0 -egt5 = scalar, U16, 208, "deg C", 1, 0 -egt6 = scalar, U16, 210, "deg C", 1, 0 -egt7 = scalar, U16, 212, "deg C", 1, 0 -egt8 = scalar, U16, 214, "deg C", 1, 0 -rawTps1Primary = scalar, S16, 216, "V", 0.001, 0 -rawPpsPrimary = scalar, S16, 218, "V", 0.001, 0 -rawClt = scalar, S16, 220, "V", 0.001, 0 -rawIat = scalar, S16, 222, "V", 0.001, 0 -rawOilPressure = scalar, S16, 224, "V", 0.001, 0 -fuelClosedLoopBinIdx = scalar, U08, 226, "", 1, 0 -tcuCurrentGear = scalar, S08, 227, "gear", 1, 0 -AFRValue = scalar, U16, 228, "AFR", 0.001, 0 -VssAcceleration = scalar, U16, 230, "m/s2", 0.0033333333333333335, 0 -lambdaValue2 = scalar, U16, 232, "", 1.0E-4, 0 -AFRValue2 = scalar, U16, 234, "AFR", 0.001, 0 -vvtPositionB1E = scalar, S16, 236, "deg", 0.02, 0 -vvtPositionB2I = scalar, S16, 238, "deg", 0.02, 0 -vvtPositionB2E = scalar, S16, 240, "deg", 0.02, 0 -fuelPidCorrection1 = scalar, S16, 242, "%", 0.01, 0 -fuelPidCorrection2 = scalar, S16, 244, "%", 0.01, 0 -rawTps1Secondary = scalar, S16, 246, "V", 0.001, 0 -rawTps2Primary = scalar, S16, 248, "V", 0.001, 0 -rawTps2Secondary = scalar, S16, 250, "V", 0.001, 0 -accelerationVert = scalar, S16, 252, "G", 0.001, 0 -gyroYaw = scalar, S16, 254, "deg/sec", 0.001, 0 -vvtTargets1 = scalar, S08, 256, "deg", 1, 0 -vvtTargets2 = scalar, S08, 257, "deg", 1, 0 -vvtTargets3 = scalar, S08, 258, "deg", 1, 0 -vvtTargets4 = scalar, S08, 259, "deg", 1, 0 -turboSpeed = scalar, U16, 260, "hz", 1, 0 -ignitionAdvanceCyl1 = scalar, S16, 262, "deg", 0.02, 0 -ignitionAdvanceCyl2 = scalar, S16, 264, "deg", 0.02, 0 -ignitionAdvanceCyl3 = scalar, S16, 266, "deg", 0.02, 0 -ignitionAdvanceCyl4 = scalar, S16, 268, "deg", 0.02, 0 -ignitionAdvanceCyl5 = scalar, S16, 270, "deg", 0.02, 0 -ignitionAdvanceCyl6 = scalar, S16, 272, "deg", 0.02, 0 -ignitionAdvanceCyl7 = scalar, S16, 274, "deg", 0.02, 0 -ignitionAdvanceCyl8 = scalar, S16, 276, "deg", 0.02, 0 -ignitionAdvanceCyl9 = scalar, S16, 278, "deg", 0.02, 0 -ignitionAdvanceCyl10 = scalar, S16, 280, "deg", 0.02, 0 -ignitionAdvanceCyl11 = scalar, S16, 282, "deg", 0.02, 0 -ignitionAdvanceCyl12 = scalar, S16, 284, "deg", 0.02, 0 -tps1Split = scalar, S16, 286, "%", 0.01, 0 -tps2Split = scalar, S16, 288, "%", 0.01, 0 -tps12Split = scalar, S16, 290, "%", 0.01, 0 -accPedalSplit = scalar, S16, 292, "%", 0.01, 0 -sparkCutReason = scalar, S08, 294, "code", 1, 0 -fuelCutReason = scalar, S08, 295, "code", 1, 0 -mafEstimate = scalar, U16, 296, "kg/h", 0.1, 0 -instantRpm = scalar, U16, 298, "rpm", 1, 0 -rawMap = scalar, U16, 300, "V", 0.001, 0 -rawAfr = scalar, U16, 302, "V", 0.001, 0 -calibrationValue2 = scalar, F32, 304, "", 1, 0 -luaInvocationCounter = scalar, U32, 308, "count", 1, 0 -luaLastCycleDuration = scalar, U32, 312, "nt", 1, 0 -tcu_currentRange = scalar, U08, 316, "", 1, 0 -tcRatio = scalar, U16, 318, "value", 0.01, 0 -lastShiftTime = scalar, F32, 320, "", 1, 0 -vssEdgeCounter = scalar, U32, 324, "", 1, 0 -issEdgeCounter = scalar, U32, 328, "", 1, 0 -auxLinear1 = scalar, F32, 332, "", 1, 0 -auxLinear2 = scalar, F32, 336, "", 1, 0 -fallbackMap = scalar, U16, 340, "kPa", 0.1, 0 -instantMAPValue = scalar, U16, 342, "kPa", 0.03333333333333333, 0 -maxLockedDuration = scalar, U16, 344, "us", 1, 0 -canWriteOk = scalar, U16, 346, "", 1, 0 -canWriteNotOk = scalar, U16, 348, "", 1, 0 -triggerPrimaryFall = scalar, U32, 352, "", 1, 0 -triggerPrimaryRise = scalar, U32, 356, "", 1, 0 -triggerSecondaryFall = scalar, U32, 360, "", 1, 0 -triggerSecondaryRise = scalar, U32, 364, "", 1, 0 -triggerVvtFall = scalar, U32, 368, "", 1, 0 -triggerVvtRise = scalar, U32, 372, "", 1, 0 -starterState = scalar, U08, 376, "", 1, 0 -starterRelayDisable = scalar, U08, 377, "", 1, 0 -multiSparkCounter = scalar, U08, 378, "", 1, 0 -extiOverflowCount = scalar, U08, 379, "", 1, 0 -alternatorStatus_pTerm = scalar, F32, 380, "", 1, 0 -alternatorStatus_iTerm = scalar, S16, 384, "", 0.01, 0 -alternatorStatus_dTerm = scalar, S16, 386, "", 0.01, 0 -alternatorStatus_output = scalar, S16, 388, "", 0.01, 0 -alternatorStatus_error = scalar, S16, 390, "", 0.01, 0 -alternatorStatus_resetCounter = scalar, U32, 392, "", 1, 0 -idleStatus_pTerm = scalar, F32, 396, "", 1, 0 -idleStatus_iTerm = scalar, S16, 400, "", 0.01, 0 -idleStatus_dTerm = scalar, S16, 402, "", 0.01, 0 -idleStatus_output = scalar, S16, 404, "", 0.01, 0 -idleStatus_error = scalar, S16, 406, "", 0.01, 0 -idleStatus_resetCounter = scalar, U32, 408, "", 1, 0 -etbStatus_pTerm = scalar, F32, 412, "", 1, 0 -etbStatus_iTerm = scalar, S16, 416, "", 0.01, 0 -etbStatus_dTerm = scalar, S16, 418, "", 0.01, 0 -etbStatus_output = scalar, S16, 420, "", 0.01, 0 -etbStatus_error = scalar, S16, 422, "", 0.01, 0 -etbStatus_resetCounter = scalar, U32, 424, "", 1, 0 -boostStatus_pTerm = scalar, F32, 428, "", 1, 0 -boostStatus_iTerm = scalar, S16, 432, "", 0.01, 0 -boostStatus_dTerm = scalar, S16, 434, "", 0.01, 0 -boostStatus_output = scalar, S16, 436, "", 0.01, 0 -boostStatus_error = scalar, S16, 438, "", 0.01, 0 -boostStatus_resetCounter = scalar, U32, 440, "", 1, 0 -wastegateDcStatus_pTerm = scalar, F32, 444, "", 1, 0 -wastegateDcStatus_iTerm = scalar, S16, 448, "", 0.01, 0 -wastegateDcStatus_dTerm = scalar, S16, 450, "", 0.01, 0 -wastegateDcStatus_output = scalar, S16, 452, "", 0.01, 0 -wastegateDcStatus_error = scalar, S16, 454, "", 0.01, 0 -wastegateDcStatus_resetCounter = scalar, U32, 456, "", 1, 0 -vvtStatus1_pTerm = scalar, F32, 460, "", 1, 0 -vvtStatus1_iTerm = scalar, S16, 464, "", 0.01, 0 -vvtStatus1_dTerm = scalar, S16, 466, "", 0.01, 0 -vvtStatus1_output = scalar, S16, 468, "", 0.01, 0 -vvtStatus1_error = scalar, S16, 470, "", 0.01, 0 -vvtStatus1_resetCounter = scalar, U32, 472, "", 1, 0 -vvtStatus2_pTerm = scalar, F32, 476, "", 1, 0 -vvtStatus2_iTerm = scalar, S16, 480, "", 0.01, 0 -vvtStatus2_dTerm = scalar, S16, 482, "", 0.01, 0 -vvtStatus2_output = scalar, S16, 484, "", 0.01, 0 -vvtStatus2_error = scalar, S16, 486, "", 0.01, 0 -vvtStatus2_resetCounter = scalar, U32, 488, "", 1, 0 -vvtStatus3_pTerm = scalar, F32, 492, "", 1, 0 -vvtStatus3_iTerm = scalar, S16, 496, "", 0.01, 0 -vvtStatus3_dTerm = scalar, S16, 498, "", 0.01, 0 -vvtStatus3_output = scalar, S16, 500, "", 0.01, 0 -vvtStatus3_error = scalar, S16, 502, "", 0.01, 0 -vvtStatus3_resetCounter = scalar, U32, 504, "", 1, 0 -vvtStatus4_pTerm = scalar, F32, 508, "", 1, 0 -vvtStatus4_iTerm = scalar, S16, 512, "", 0.01, 0 -vvtStatus4_dTerm = scalar, S16, 514, "", 0.01, 0 -vvtStatus4_output = scalar, S16, 516, "", 0.01, 0 -vvtStatus4_error = scalar, S16, 518, "", 0.01, 0 -vvtStatus4_resetCounter = scalar, U32, 520, "", 1, 0 -auxSpeed1 = scalar, U16, 524, "s", 1, 0 -auxSpeed2 = scalar, U16, 526, "s", 1, 0 -ISSValue = scalar, U16, 528, "RPM", 1, 0 -rawAnalogInput1 = scalar, S16, 530, "V", 0.001, 0 -rawAnalogInput2 = scalar, S16, 532, "V", 0.001, 0 -rawAnalogInput3 = scalar, S16, 534, "V", 0.001, 0 -rawAnalogInput4 = scalar, S16, 536, "V", 0.001, 0 -rawAnalogInput5 = scalar, S16, 538, "V", 0.001, 0 -rawAnalogInput6 = scalar, S16, 540, "V", 0.001, 0 -rawAnalogInput7 = scalar, S16, 542, "V", 0.001, 0 -rawAnalogInput8 = scalar, S16, 544, "V", 0.001, 0 -gppwmOutput1 = scalar, U08, 546, "%", 0.5, 0 -gppwmOutput2 = scalar, U08, 547, "%", 0.5, 0 -gppwmOutput3 = scalar, U08, 548, "%", 0.5, 0 -gppwmOutput4 = scalar, U08, 549, "%", 0.5, 0 -gppwmXAxis1 = scalar, S16, 550, "", 1, 0 -gppwmXAxis2 = scalar, S16, 552, "", 1, 0 -gppwmXAxis3 = scalar, S16, 554, "", 1, 0 -gppwmXAxis4 = scalar, S16, 556, "", 1, 0 -gppwmYAxis1 = scalar, S16, 558, "", 0.1, 0 -gppwmYAxis2 = scalar, S16, 560, "", 0.1, 0 -gppwmYAxis3 = scalar, S16, 562, "", 0.1, 0 -gppwmYAxis4 = scalar, S16, 564, "", 0.1, 0 -rawBattery = scalar, S16, 566, "V", 0.001, 0 -ignBlendParameter1 = scalar, S16, 568, "", 0.1, 0 -ignBlendParameter2 = scalar, S16, 570, "", 0.1, 0 -ignBlendParameter3 = scalar, S16, 572, "", 0.1, 0 -ignBlendParameter4 = scalar, S16, 574, "", 0.1, 0 -ignBlendBias1 = scalar, U08, 576, "%", 0.5, 0 -ignBlendBias2 = scalar, U08, 577, "%", 0.5, 0 -ignBlendBias3 = scalar, U08, 578, "%", 0.5, 0 -ignBlendBias4 = scalar, U08, 579, "%", 0.5, 0 -ignBlendOutput1 = scalar, S16, 580, "deg", 0.01, 0 -ignBlendOutput2 = scalar, S16, 582, "deg", 0.01, 0 -ignBlendOutput3 = scalar, S16, 584, "deg", 0.01, 0 -ignBlendOutput4 = scalar, S16, 586, "deg", 0.01, 0 -veBlendParameter1 = scalar, S16, 588, "", 0.1, 0 -veBlendParameter2 = scalar, S16, 590, "", 0.1, 0 -veBlendParameter3 = scalar, S16, 592, "", 0.1, 0 -veBlendParameter4 = scalar, S16, 594, "", 0.1, 0 -veBlendBias1 = scalar, U08, 596, "%", 0.5, 0 -veBlendBias2 = scalar, U08, 597, "%", 0.5, 0 -veBlendBias3 = scalar, U08, 598, "%", 0.5, 0 -veBlendBias4 = scalar, U08, 599, "%", 0.5, 0 -veBlendOutput1 = scalar, S16, 600, "%", 0.01, 0 -veBlendOutput2 = scalar, S16, 602, "%", 0.01, 0 -veBlendOutput3 = scalar, S16, 604, "%", 0.01, 0 -veBlendOutput4 = scalar, S16, 606, "%", 0.01, 0 -boostOpenLoopBlendParameter1 = scalar, S16, 608, "", 0.1, 0 -boostOpenLoopBlendParameter2 = scalar, S16, 610, "", 0.1, 0 -boostOpenLoopBlendBias1 = scalar, U08, 612, "%", 0.5, 0 -boostOpenLoopBlendBias2 = scalar, U08, 613, "%", 0.5, 0 -boostOpenLoopBlendOutput1 = scalar, S08, 614, "%", 1, 0 -boostOpenLoopBlendOutput2 = scalar, S08, 615, "%", 1, 0 -boostClosedLoopBlendParameter1 = scalar, S16, 616, "", 0.1, 0 -boostClosedLoopBlendParameter2 = scalar, S16, 618, "", 0.1, 0 -boostClosedLoopBlendBias1 = scalar, U08, 620, "%", 0.5, 0 -boostClosedLoopBlendBias2 = scalar, U08, 621, "%", 0.5, 0 -boostClosedLoopBlendOutput1 = scalar, S16, 622, "%", 0.1, 0 -boostClosedLoopBlendOutput2 = scalar, S16, 624, "%", 0.1, 0 -coilState1 = bits, U32, 628, [0:0] -coilState2 = bits, U32, 628, [1:1] -coilState3 = bits, U32, 628, [2:2] -coilState4 = bits, U32, 628, [3:3] -coilState5 = bits, U32, 628, [4:4] -coilState6 = bits, U32, 628, [5:5] -coilState7 = bits, U32, 628, [6:6] -coilState8 = bits, U32, 628, [7:7] -coilState9 = bits, U32, 628, [8:8] -coilState10 = bits, U32, 628, [9:9] -coilState11 = bits, U32, 628, [10:10] -coilState12 = bits, U32, 628, [11:11] -injectorState1 = bits, U32, 628, [12:12] -injectorState2 = bits, U32, 628, [13:13] -injectorState3 = bits, U32, 628, [14:14] -injectorState4 = bits, U32, 628, [15:15] -injectorState5 = bits, U32, 628, [16:16] -injectorState6 = bits, U32, 628, [17:17] -injectorState7 = bits, U32, 628, [18:18] -injectorState8 = bits, U32, 628, [19:19] -injectorState9 = bits, U32, 628, [20:20] -injectorState10 = bits, U32, 628, [21:21] -injectorState11 = bits, U32, 628, [22:22] -injectorState12 = bits, U32, 628, [23:23] -outputRequestPeriod = scalar, U32, 632, "", 1, 0 -mapFast = scalar, F32, 636, "", 1, 0 -luaGauges1 = scalar, F32, 640, "value", 1, 0 -luaGauges2 = scalar, F32, 644, "value", 1, 0 -rawMaf2 = scalar, U16, 648, "V", 0.001, 0 -mafMeasured2 = scalar, U16, 650, "kg/h", 0.1, 0 -schedulingUsedCount = scalar, U16, 652, "", 1, 0 -Gego = scalar, U16, 654, "%", 0.01, 0 -testBenchIter = scalar, U16, 656, "count", 1, 0 -oilTemp = scalar, S16, 658, "deg C", 0.01, 0 -fuelTemp = scalar, S16, 660, "deg C", 0.01, 0 -ambientTemp = scalar, S16, 662, "deg C", 0.01, 0 -compressorDischargeTemp = scalar, S16, 664, "deg C", 0.01, 0 -compressorDischargePressure = scalar, U16, 666, "kPa", 0.03333333333333333, 0 -throttleInletPressure = scalar, U16, 668, "kPa", 0.03333333333333333, 0 -ignitionOnTime = scalar, U16, 670, "sec", 1, 0 -engineRunTime = scalar, U16, 672, "sec", 1, 0 -distanceTraveled = scalar, U16, 674, "km", 0.1, 0 -afrGasolineScale = scalar, U16, 676, "AFR", 0.001, 0 -afr2GasolineScale = scalar, U16, 678, "AFR", 0.001, 0 -actualLastInjectionStage2 = scalar, U16, 680, "ms", 0.0033333333333333335, 0 -injectorDutyCycleStage2 = scalar, U08, 682, "%", 0.5, 0 -unusedAtTheEnd1 = scalar, U08, 683, "", 1, 0 -unusedAtTheEnd2 = scalar, U08, 684, "", 1, 0 -unusedAtTheEnd3 = scalar, U08, 685, "", 1, 0 -unusedAtTheEnd4 = scalar, U08, 686, "", 1, 0 -unusedAtTheEnd5 = scalar, U08, 687, "", 1, 0 -unusedAtTheEnd6 = scalar, U08, 688, "", 1, 0 -unusedAtTheEnd7 = scalar, U08, 689, "", 1, 0 -unusedAtTheEnd8 = scalar, U08, 690, "", 1, 0 -unusedAtTheEnd9 = scalar, U08, 691, "", 1, 0 -unusedAtTheEnd10 = scalar, U08, 692, "", 1, 0 -unusedAtTheEnd11 = scalar, U08, 693, "", 1, 0 -unusedAtTheEnd12 = scalar, U08, 694, "", 1, 0 -unusedAtTheEnd13 = scalar, U08, 695, "", 1, 0 -unusedAtTheEnd14 = scalar, U08, 696, "", 1, 0 -unusedAtTheEnd15 = scalar, U08, 697, "", 1, 0 -unusedAtTheEnd16 = scalar, U08, 698, "", 1, 0 -unusedAtTheEnd17 = scalar, U08, 699, "", 1, 0 -unusedAtTheEnd18 = scalar, U08, 700, "", 1, 0 -unusedAtTheEnd19 = scalar, U08, 701, "", 1, 0 -unusedAtTheEnd20 = scalar, U08, 702, "", 1, 0 -unusedAtTheEnd21 = scalar, U08, 703, "", 1, 0 -unusedAtTheEnd22 = scalar, U08, 704, "", 1, 0 -unusedAtTheEnd23 = scalar, U08, 705, "", 1, 0 -unusedAtTheEnd24 = scalar, U08, 706, "", 1, 0 -unusedAtTheEnd25 = scalar, U08, 707, "", 1, 0 -unusedAtTheEnd26 = scalar, U08, 708, "", 1, 0 -unusedAtTheEnd27 = scalar, U08, 709, "", 1, 0 -unusedAtTheEnd28 = scalar, U08, 710, "", 1, 0 -unusedAtTheEnd29 = scalar, U08, 711, "", 1, 0 -unusedAtTheEnd30 = scalar, U08, 712, "", 1, 0 -unusedAtTheEnd31 = scalar, U08, 713, "", 1, 0 -unusedAtTheEnd32 = scalar, U08, 714, "", 1, 0 -unusedAtTheEnd33 = scalar, U08, 715, "", 1, 0 -unusedAtTheEnd34 = scalar, U08, 716, "", 1, 0 -unusedAtTheEnd35 = scalar, U08, 717, "", 1, 0 -unusedAtTheEnd36 = scalar, U08, 718, "", 1, 0 -unusedAtTheEnd37 = scalar, U08, 719, "", 1, 0 -unusedAtTheEnd38 = scalar, U08, 720, "", 1, 0 -unusedAtTheEnd39 = scalar, U08, 721, "", 1, 0 -unusedAtTheEnd40 = scalar, U08, 722, "", 1, 0 -unusedAtTheEnd41 = scalar, U08, 723, "", 1, 0 -unusedAtTheEnd42 = scalar, U08, 724, "", 1, 0 -unusedAtTheEnd43 = scalar, U08, 725, "", 1, 0 -unusedAtTheEnd44 = scalar, U08, 726, "", 1, 0 -unusedAtTheEnd45 = scalar, U08, 727, "", 1, 0 -unusedAtTheEnd46 = scalar, U08, 728, "", 1, 0 -unusedAtTheEnd47 = scalar, U08, 729, "", 1, 0 -unusedAtTheEnd48 = scalar, U08, 730, "", 1, 0 -unusedAtTheEnd49 = scalar, U08, 731, "", 1, 0 -unusedAtTheEnd50 = scalar, U08, 732, "", 1, 0 -unusedAtTheEnd51 = scalar, U08, 733, "", 1, 0 -unusedAtTheEnd52 = scalar, U08, 734, "", 1, 0 -unusedAtTheEnd53 = scalar, U08, 735, "", 1, 0 -unusedAtTheEnd54 = scalar, U08, 736, "", 1, 0 -unusedAtTheEnd55 = scalar, U08, 737, "", 1, 0 -unusedAtTheEnd56 = scalar, U08, 738, "", 1, 0 -unusedAtTheEnd57 = scalar, U08, 739, "", 1, 0 -unusedAtTheEnd58 = scalar, U08, 740, "", 1, 0 -unusedAtTheEnd59 = scalar, U08, 741, "", 1, 0 -unusedAtTheEnd60 = scalar, U08, 742, "", 1, 0 -unusedAtTheEnd61 = scalar, U08, 743, "", 1, 0 -unusedAtTheEnd62 = scalar, U08, 744, "", 1, 0 -unusedAtTheEnd63 = scalar, U08, 745, "", 1, 0 -unusedAtTheEnd64 = scalar, U08, 746, "", 1, 0 -unusedAtTheEnd65 = scalar, U08, 747, "", 1, 0 -unusedAtTheEnd66 = scalar, U08, 748, "", 1, 0 -unusedAtTheEnd67 = scalar, U08, 749, "", 1, 0 -unusedAtTheEnd68 = scalar, U08, 750, "", 1, 0 -unusedAtTheEnd69 = scalar, U08, 751, "", 1, 0 -unusedAtTheEnd70 = scalar, U08, 752, "", 1, 0 -unusedAtTheEnd71 = scalar, U08, 753, "", 1, 0 -unusedAtTheEnd72 = scalar, U08, 754, "", 1, 0 -unusedAtTheEnd73 = scalar, U08, 755, "", 1, 0 -unusedAtTheEnd74 = scalar, U08, 756, "", 1, 0 -unusedAtTheEnd75 = scalar, U08, 757, "", 1, 0 -unusedAtTheEnd76 = scalar, U08, 758, "", 1, 0 -unusedAtTheEnd77 = scalar, U08, 759, "", 1, 0 -unusedAtTheEnd78 = scalar, U08, 760, "", 1, 0 -unusedAtTheEnd79 = scalar, U08, 761, "", 1, 0 -unusedAtTheEnd80 = scalar, U08, 762, "", 1, 0 -unusedAtTheEnd81 = scalar, U08, 763, "", 1, 0 -unusedAtTheEnd82 = scalar, U08, 764, "", 1, 0 -unusedAtTheEnd83 = scalar, U08, 765, "", 1, 0 -unusedAtTheEnd84 = scalar, U08, 766, "", 1, 0 -unusedAtTheEnd85 = scalar, U08, 767, "", 1, 0 -unusedAtTheEnd86 = scalar, U08, 768, "", 1, 0 -unusedAtTheEnd87 = scalar, U08, 769, "", 1, 0 -unusedAtTheEnd88 = scalar, U08, 770, "", 1, 0 -unusedAtTheEnd89 = scalar, U08, 771, "", 1, 0 -unusedAtTheEnd90 = scalar, U08, 772, "", 1, 0 -unusedAtTheEnd91 = scalar, U08, 773, "", 1, 0 -unusedAtTheEnd92 = scalar, U08, 774, "", 1, 0 -unusedAtTheEnd93 = scalar, U08, 775, "", 1, 0 -unusedAtTheEnd94 = scalar, U08, 776, "", 1, 0 -unusedAtTheEnd95 = scalar, U08, 777, "", 1, 0 -unusedAtTheEnd96 = scalar, U08, 778, "", 1, 0 -unusedAtTheEnd97 = scalar, U08, 779, "", 1, 0 -unusedAtTheEnd98 = scalar, U08, 780, "", 1, 0 -unusedAtTheEnd99 = scalar, U08, 781, "", 1, 0 -unusedAtTheEnd100 = scalar, U08, 782, "", 1, 0 -unusedAtTheEnd101 = scalar, U08, 783, "", 1, 0 -unusedAtTheEnd102 = scalar, U08, 784, "", 1, 0 -unusedAtTheEnd103 = scalar, U08, 785, "", 1, 0 -unusedAtTheEnd104 = scalar, U08, 786, "", 1, 0 -unusedAtTheEnd105 = scalar, U08, 787, "", 1, 0 -unusedAtTheEnd106 = scalar, U08, 788, "", 1, 0 -unusedAtTheEnd107 = scalar, U08, 789, "", 1, 0 -unusedAtTheEnd108 = scalar, U08, 790, "", 1, 0 -unusedAtTheEnd109 = scalar, U08, 791, "", 1, 0 -unusedAtTheEnd110 = scalar, U08, 792, "", 1, 0 -unusedAtTheEnd111 = scalar, U08, 793, "", 1, 0 -unusedAtTheEnd112 = scalar, U08, 794, "", 1, 0 -unusedAtTheEnd113 = scalar, U08, 795, "", 1, 0 -unusedAtTheEnd114 = scalar, U08, 796, "", 1, 0 -unusedAtTheEnd115 = scalar, U08, 797, "", 1, 0 -unusedAtTheEnd116 = scalar, U08, 798, "", 1, 0 -unusedAtTheEnd117 = scalar, U08, 799, "", 1, 0 -; total TS size = 800 -totalFuelCorrection = scalar, F32, 800, "mult", 1, 0 -running_postCrankingFuelCorrection = scalar, F32, 804, "", 1, 0 -running_intakeTemperatureCoefficient = scalar, F32, 808, "", 1, 0 -running_coolantTemperatureCoefficient = scalar, F32, 812, "", 1, 0 -running_timeSinceCrankingInSecs = scalar, F32, 816, "secs", 1, 0 -running_baseFuel = scalar, U16, 820, "mg", 0.01, 0 -running_fuel = scalar, U16, 822, "mg", 0.01, 0 -afrTableYAxis = scalar, U16, 824, "%", 0.01, 0 -targetLambda = scalar, U16, 826, "", 1.0E-4, 0 -targetAFR = scalar, U16, 828, "ratio", 0.001, 0 -stoichiometricRatio = scalar, U16, 830, "ratio", 0.001, 0 -sdTcharge_coff = scalar, F32, 832, "", 1, 0 -sdAirMassInOneCylinder = scalar, F32, 836, "g", 1, 0 -normalizedCylinderFilling = scalar, F32, 840, "%", 1, 0 -; total TS size = 844 -baseDwell = scalar, F32, 844, "ms", 1, 0 -sparkDwell = scalar, F32, 848, "ms", 1, 0 -dwellAngle = scalar, F32, 852, "deg", 1, 0 -cltTimingCorrection = scalar, S16, 856, "deg", 0.01, 0 -timingIatCorrection = scalar, S16, 858, "deg", 0.01, 0 -timingPidCorrection = scalar, S16, 860, "deg", 0.01, 0 -dwellVoltageCorrection = scalar, F32, 864, "", 1, 0 -luaTimingAdd = scalar, F32, 868, "deg", 1, 0 -luaTimingMult = scalar, F32, 872, "deg", 1, 0 -; total TS size = 876 -m_knockLevel = scalar, F32, 876, "Volts", 1, 0 -m_knockCyl1 = scalar, S08, 880, "dBv", 1, 0 -m_knockCyl2 = scalar, S08, 881, "dBv", 1, 0 -m_knockCyl3 = scalar, S08, 882, "dBv", 1, 0 -m_knockCyl4 = scalar, S08, 883, "dBv", 1, 0 -m_knockCyl5 = scalar, S08, 884, "dBv", 1, 0 -m_knockCyl6 = scalar, S08, 885, "dBv", 1, 0 -m_knockCyl7 = scalar, S08, 886, "dBv", 1, 0 -m_knockCyl8 = scalar, S08, 887, "dBv", 1, 0 -m_knockCyl9 = scalar, S08, 888, "dBv", 1, 0 -m_knockCyl10 = scalar, S08, 889, "dBv", 1, 0 -m_knockCyl11 = scalar, S08, 890, "dBv", 1, 0 -m_knockCyl12 = scalar, S08, 891, "dBv", 1, 0 -m_knockRetard = scalar, F32, 892, "deg", 1, 0 -m_knockThreshold = scalar, F32, 896, "", 1, 0 -m_knockCount = scalar, U32, 900, "", 1, 0 -m_maximumRetard = scalar, F32, 904, "", 1, 0 -; total TS size = 908 -m_requested_pump = scalar, F32, 908, "", 1, 0 -fuel_requested_percent = scalar, F32, 912, "", 1, 0 -fuel_requested_percent_pi = scalar, F32, 916, "", 1, 0 -noValve = bits, U32, 920, [0:0] -angleAboveMin = bits, U32, 920, [1:1] -isHpfpInactive = bits, U32, 920, [2:2] -nextLobe = scalar, F32, 924, "", 1, 0 -di_nextStart = scalar, F32, 928, "v", 1, 0 -; total TS size = 932 -m_deadtime = scalar, F32, 932, "ms", 1, 0 -pressureDelta = scalar, F32, 936, "kPa", 1, 0 -pressureRatio = scalar, F32, 940, "", 1, 0 -; total TS size = 944 -retardThresholdRpm = scalar, S32, 944, "", 1, 0 -combinedConditions = bits, U32, 948, [0:0] -launchActivatePinState = bits, U32, 948, [1:1] -isLaunchCondition = bits, U32, 948, [2:2] -isSwitchActivated = bits, U32, 948, [3:3] -isClutchActivated = bits, U32, 948, [4:4] -isValidInputPin = bits, U32, 948, [5:5] -activateSwitchCondition = bits, U32, 948, [6:6] -rpmCondition = bits, U32, 948, [7:7] -speedCondition = bits, U32, 948, [8:8] -tpsCondition = bits, U32, 948, [9:9] -; total TS size = 952 -isAntilagCondition = bits, U32, 952, [0:0] -ALSMinRPMCondition = bits, U32, 952, [1:1] -ALSMaxRPMCondition = bits, U32, 952, [2:2] -ALSMinCLTCondition = bits, U32, 952, [3:3] -ALSMaxCLTCondition = bits, U32, 952, [4:4] -ALSMaxThrottleIntentCondition = bits, U32, 952, [5:5] -isALSSwitchActivated = bits, U32, 952, [6:6] -ALSActivatePinState = bits, U32, 952, [7:7] -ALSSwitchCondition = bits, U32, 952, [8:8] -ALSTimerCondition = bits, U32, 952, [9:9] -fuelALSCorrection = scalar, F32, 956, "", 1, 0 -timingALSCorrection = scalar, S16, 960, "deg", 0.01, 0 -; total TS size = 964 -isTpsInvalid = bits, U32, 964, [0:0] -m_shouldResetPid = bits, U32, 964, [1:1] -isBelowClosedLoopThreshold = bits, U32, 964, [2:2] -isNotClosedLoop = bits, U32, 964, [3:3] -isZeroRpm = bits, U32, 964, [4:4] -hasInitBoost = bits, U32, 964, [5:5] -rpmTooLow = bits, U32, 964, [6:6] -tpsTooLow = bits, U32, 964, [7:7] -mapTooLow = bits, U32, 964, [8:8] -luaTargetAdd = scalar, S16, 968, "v", 0.5, 0 -boostOutput = scalar, S16, 970, "percent", 0.01, 0 -luaTargetMult = scalar, F32, 972, "v", 1, 0 -openLoopPart = scalar, F32, 976, "v", 1, 0 -luaOpenLoopAdd = scalar, F32, 980, "v", 1, 0 -boostControllerClosedLoopPart = scalar, S08, 984, "%", 0.5, 0 -boostControlTarget = scalar, S16, 986, "kPa", 0.03333333333333333, 0 -; total TS size = 988 -acButtonState = bits, U32, 988, [0:0] -m_acEnabled = bits, U32, 988, [1:1] -engineTooSlow = bits, U32, 988, [2:2] -engineTooFast = bits, U32, 988, [3:3] -noClt = bits, U32, 988, [4:4] -engineTooHot = bits, U32, 988, [5:5] -tpsTooHigh = bits, U32, 988, [6:6] -isDisabledByLua = bits, U32, 988, [7:7] -acCompressorState = bits, U32, 988, [8:8] -latest_usage_ac_control = scalar, S32, 992, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 996, "", 1, 0 -; total TS size = 1000 -cranking = bits, U32, 1000, [0:0] -notRunning = bits, U32, 1000, [1:1] -disabledWhileEngineStopped = bits, U32, 1000, [2:2] -brokenClt = bits, U32, 1000, [3:3] -enabledForAc = bits, U32, 1000, [4:4] -hot = bits, U32, 1000, [5:5] -cold = bits, U32, 1000, [6:6] -; total TS size = 1004 -isPrime = bits, U32, 1004, [0:0] -engineTurnedRecently = bits, U32, 1004, [1:1] -isFuelPumpOn = bits, U32, 1004, [2:2] -ignitionOn = bits, U32, 1004, [3:3] -; total TS size = 1008 -isBenchTest = bits, U32, 1008, [0:0] -hasIgnitionVoltage = bits, U32, 1008, [1:1] -mainRelayState = bits, U32, 1008, [2:2] -delayedShutoffRequested = bits, U32, 1008, [3:3] -; total TS size = 1012 -lua_fuelAdd = scalar, F32, 1012, "g", 1, 0 -lua_fuelMult = scalar, F32, 1016, "", 1, 0 -lua_clutchUpState = bits, U32, 1020, [0:0] -lua_brakePedalState = bits, U32, 1020, [1:1] -lua_acRequestState = bits, U32, 1020, [2:2] -lua_luaDisableEtb = bits, U32, 1020, [3:3] -lua_luaIgnCut = bits, U32, 1020, [4:4] -sd_tCharge = scalar, S16, 1024, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1028, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1032, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1036, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1040, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1044, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1048, "", 1, 0 -hellenBoardId = scalar, S16, 1052, "id", 1, 0 -clutchUpState = bits, U32, 1056, [0:0] -clutchDownState = bits, U32, 1056, [1:1] -brakePedalState = bits, U32, 1056, [2:2] -startStopState = bits, U32, 1056, [3:3] -startStopStateToggleCounter = scalar, U32, 1060, "", 1, 0 -egtValue1 = scalar, F32, 1064, "", 1, 0 -egtValue2 = scalar, F32, 1068, "", 1, 0 -desiredRpmLimit = scalar, S16, 1072, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1076, "", 1, 0 -sparkCounter = scalar, U32, 1080, "", 1, 0 -fuelingLoad = scalar, F32, 1084, "", 1, 0 -ignitionLoad = scalar, F32, 1088, "", 1, 0 -veTableYAxis = scalar, U16, 1092, "%", 0.01, 0 -; total TS size = 1096 -tpsFrom = scalar, F32, 1096 -tpsTo = scalar, F32, 1100 -deltaTps = scalar, F32, 1104 -extraFuel = scalar, F32, 1108, "", 1, 0 -valueFromTable = scalar, F32, 1112, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1116, [0:0] -isBelowDecelThreshold = bits, U32, 1116, [1:1] -isTimeToResetAccumulator = bits, U32, 1116, [2:2] -isFractionalEnrichment = bits, U32, 1116, [3:3] -belowEpsilon = bits, U32, 1116, [4:4] -tooShort = bits, U32, 1116, [5:5] -fractionalInjFuel = scalar, F32, 1120, "", 1, 0 -accumulatedValue = scalar, F32, 1124, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1128, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1132, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1136, "", 1, 0 -cycleCnt = scalar, S32, 1140, "", 1, 0 -; total TS size = 1144 -hwEventCounters1 = scalar, U32, 1144, "", 1, 0 -hwEventCounters2 = scalar, U32, 1148, "", 1, 0 -hwEventCounters3 = scalar, U32, 1152, "", 1, 0 -hwEventCounters4 = scalar, U32, 1156, "", 1, 0 -hwEventCounters5 = scalar, U32, 1160, "", 1, 0 -hwEventCounters6 = scalar, U32, 1164, "", 1, 0 -vvtCamCounter = scalar, U32, 1168, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1172, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1176, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1180, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1181, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1184, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1188, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1192, "", 1, 0 -; total TS size = 1196 -crankSynchronizationCounter = scalar, U32, 1196, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1200, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1204, "", 1, 0 -triggerStateIndex = scalar, U08, 1208, "", 1, 0 -vvtCounter = scalar, U08, 1209, "", 1, 0 -vvtStateIndex = scalar, U08, 1210, "", 1, 0 -; total TS size = 1212 -camResyncCounter = scalar, U08, 1212, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1216, [0:0] -; total TS size = 1220 -wallFuelCorrection = scalar, F32, 1220, "", 1, 0 -wallFuel = scalar, F32, 1224, "", 1, 0 -; total TS size = 1228 -idleState = bits, S32, 1228, [0:2], "not important" -currentIdlePosition = scalar, F32, 1232 -baseIdlePosition = scalar, F32, 1236 -idleClosedLoop = scalar, F32, 1240 -iacByTpsTaper = scalar, F32, 1244 -throttlePedalUpState = scalar, S32, 1248, "", 1, 0 -mightResetPid = bits, U32, 1252, [0:0] -shouldResetPid = bits, U32, 1252, [1:1] -wasResetPid = bits, U32, 1252, [2:2] -mustResetPid = bits, U32, 1252, [3:3] -isCranking = bits, U32, 1252, [4:4] -isIacTableForCoasting = bits, U32, 1252, [5:5] -notIdling = bits, U32, 1252, [6:6] -needReset = bits, U32, 1252, [7:7] -isInDeadZone = bits, U32, 1252, [8:8] -isBlipping = bits, U32, 1252, [9:9] -looksLikeRunning = bits, U32, 1252, [10:10] -looksLikeCoasting = bits, U32, 1252, [11:11] -looksLikeCrankToIdle = bits, U32, 1252, [12:12] -isIdleCoasting = bits, U32, 1252, [13:13] -isIdleClosedLoop = bits, U32, 1252, [14:14] -idleTarget = scalar, S32, 1256, "", 1, 0 -targetRpmByClt = scalar, S32, 1260, "", 1, 0 -targetRpmAcBump = scalar, S32, 1264, "", 1, 0 -iacByRpmTaper = scalar, F32, 1268 -luaAdd = scalar, F32, 1272 -; total TS size = 1276 -idlePosition = scalar, F32, 1276, "per", 1, 0 -trim = scalar, F32, 1280, "", 1, 0 -luaAdjustment = scalar, F32, 1284, "per", 1, 0 -m_wastegatePosition = scalar, F32, 1288, "per", 1, 0 -etbFeedForward = scalar, F32, 1292 -etbIntegralError = scalar, F32, 1296, "", 1, 0 -etbCurrentTarget = scalar, F32, 1300, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1304, "%", 1, 0 -etbRevLimitActive = bits, U32, 1308, [0:0] -jamDetected = bits, U32, 1308, [1:1] -etbDutyRateOfChange = scalar, F32, 1312, "per", 1, 0 -etbDutyAverage = scalar, F32, 1316, "per", 1, 0 -etbTpsErrorCounter = scalar, U16, 1320, "count", 1, 0 -etbPpsErrorCounter = scalar, U16, 1322, "count", 1, 0 -etbErrorCode = scalar, S08, 1324, "", 1, 0 -jamTimer = scalar, U16, 1326, "sec", 0.01, 0 -; total TS size = 1328 -faultCode = scalar, U08, 1328, "", 1, 0 -heaterDuty = scalar, U08, 1329, "%", 1, 0 -pumpDuty = scalar, U08, 1330, "%", 1, 0 -tempC = scalar, U16, 1332, "C", 1, 0 -nernstVoltage = scalar, U16, 1334, "V", 0.001, 0 -esr = scalar, U16, 1336, "ohm", 1, 0 -; total TS size = 1340 -dcOutput0 = scalar, F32, 1340, "per", 1, 0 -isEnabled0_int = scalar, U08, 1344, "per", 1, 0 -isEnabled0 = bits, U32, 1348, [0:0] -; total TS size = 1352 -value0 = scalar, U16, 1352, "value", 1, 0 -value1 = scalar, U16, 1354, "value", 1, 0 -errorRate = scalar, F32, 1356, "ratio", 1, 0 -; total TS size = 1360 -throttleUseWotModel = bits, U32, 1360, [0:0] -throttleModelCrossoverAngle = scalar, S16, 1364, "%", 0.01, 0 -throttleEstimatedFlow = scalar, F32, 1368, "g/s", 1, 0 -; total TS size = 1372 -vvtTarget = scalar, U16, 1372, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1374, "%", 0.5, 0 -; total TS size = 1376 -lambdaCurrentlyGood = bits, U32, 1376, [0:0] -lambdaMonitorCut = bits, U32, 1376, [1:1] -lambdaTimeSinceGood = scalar, U16, 1380, "sec", 0.01, 0 -; total TS size = 1384 diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 6fb5ea7af8..2600bc6c26 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/LiveDataProcessor.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java index 20d3acac11..697035b864 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java @@ -29,7 +29,7 @@ public class LiveDataProcessor { private final static String enumContentFileName = "generated/live_data_ids.h"; - private final static String tsOutputsDestination = "tunerstudio/generated/temp/"; + private final static String tsOutputsDestination = "generated/"; private final StringBuilder enumContent = new StringBuilder(header + "#pragma once\n" + diff --git a/java_tools/enum2string.jar b/java_tools/enum2string.jar index 255b8cbf6b..6a7e4d5a2d 100644 Binary files a/java_tools/enum2string.jar and b/java_tools/enum2string.jar differ