diff --git a/generated/controllers/generated/rusefi_generated_XXX.h b/generated/controllers/generated/rusefi_generated_XXX.h index 57dcdde..8e206c0 100644 --- a/generated/controllers/generated/rusefi_generated_XXX.h +++ b/generated/controllers/generated/rusefi_generated_XXX.h @@ -1188,7 +1188,7 @@ #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 624877416 +#define SIGNATURE_HASH 3106215159 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define SIMULATOR_TUNE_BIN_FILE_NAME_PREFIX "generated/simulator_tune_image" #define SIMULATOR_TUNE_BIN_FILE_NAME_SUFFIX ".bin" @@ -1562,14 +1562,14 @@ #define ts_show_vr_threshold_all false #define ts_show_vr_threshold_pins true #define ts_show_vvt_output true -#define TS_SIGNATURE "rusEFI default.2024.03.29.XXX.624877416" +#define TS_SIGNATURE "rusEFI default.2024.04.02.XXX.3106215159" #define TS_SIMULATE_CAN '>' #define TS_SIMULATE_CAN_char > #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' #define TS_TEST_COMMAND_char t -#define TS_TOTAL_OUTPUT_SIZE 1488 +#define TS_TOTAL_OUTPUT_SIZE 1716 #define TS_TRIGGER_SCOPE_CHANNEL_1_NAME "Channel 1" #define TS_TRIGGER_SCOPE_CHANNEL_2_NAME "Channel 2" #define TS_TRIGGER_SCOPE_DISABLE 5 diff --git a/generated/controllers/generated/signature_XXX.h b/generated/controllers/generated/signature_XXX.h index 8411098..3af8eff 100644 --- a/generated/controllers/generated/signature_XXX.h +++ b/generated/controllers/generated/signature_XXX.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition-all.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 624877416 -#define TS_SIGNATURE "rusEFI default.2024.03.29.XXX.624877416" +#define SIGNATURE_HASH 3106215159 +#define TS_SIGNATURE "rusEFI default.2024.04.02.XXX.3106215159" diff --git a/generated/tunerstudio/generated/rusefi_XXX.ini b/generated/tunerstudio/generated/rusefi_XXX.ini index 8e2f693..6330d9e 100644 --- a/generated/tunerstudio/generated/rusefi_XXX.ini +++ b/generated/tunerstudio/generated/rusefi_XXX.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI default.2024.03.29.XXX.624877416" + signature = "rusEFI default.2024.04.02.XXX.3106215159" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI default.2024.03.29.XXX.624877416" ; signature is expected to be 7 or more characters. + signature= "rusEFI default.2024.04.02.XXX.3106215159" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -100,7 +100,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Fri Mar 29 17:15:39 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Apr 02 17:44:57 UTC 2024 pageSize = 22400 page = 1 @@ -210,7 +210,7 @@ knockBandCustom = scalar, F32, 428, "kHz", 1, 0, 0, 20, 2 displacement = scalar, U16, 432, "L", 0.001, 0, 0, 65, 3 triggerSimulatorRpm = scalar, U16, 434, "RPM", 1, 0, 0, 30000, 0 cylindersCount = scalar, U32, 436, "", 1, 0, 1, 12, 0 -firingOrder = bits, U08, 440, [0:6], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "1-5-4-8-3-7-2-6", "fo33", "fo34", "fo35", "fo36", "fo37", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +firingOrder = bits, U08, 440, [0:6], "One Cylinder", "1-3-4-2", "1-2-4-3", "1-3-2-4", "1-5-3-6-2-4", "1-8-4-3-6-5-7-2", "1-2-4-5-3", "1-4-2-5-3-6", "1-2", "1-2-3-4-5-6", "1-2-3", "1-8-7-2-6-5-4-3", "1-5-4-2-6-3-7-8", "1-6-3-2-5-4", "1-10-9-4-3-6-5-8-7_2", "1-7-5-11-3-9-6-12-2-8-4-10", "1-7-4-10-2-8-6-12-3-9-5-11", "1-4-3-2", "1-12-5-8-3-10-6-7-2-11-4-9", "1-2-7-8-4-5-6-3", "1-3-7-2-6-5-4-8", "1-2-3-4-5-6-7-8-9", "INVALID", "1-2-3-4-5-6-7-8-9-10-11-12", "1-3-2", "1-2-3-4-5-6-7-8", "1-5-4-8-6-3-7-2", "1-4-3-6-2-5", "1-8-7-3-6-5-4-2", "1-6-2-4-3-5", "1-6-5-4-3-2", "1-4-5-2-3-6", "1-5-4-8-3-7-2-6", "1-6-5-10-2-7-3-8-4-9", "fo34", "fo35", "fo36", "fo37", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" justATempTest = scalar, U08, 441, "", 1, 0, 0, 100, 0 communityCommsLedPid = bits, U16, 442, [0:7], $gpio_list cylinderBore = scalar, F32, 444, "mm", 1, 0, 0, 20000, 2 @@ -2503,7 +2503,7 @@ dwellVoltageCorrValues = array, U08, 22390, [8], "multiplier", 0.02, 0, 0, 5, 2 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1488 + ochBlockSize = 1716 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3138,179 +3138,261 @@ hot0 = bits, U32, 1072, [5:5] cold0 = bits, U32, 1072, [6:6] disabledBySpeed0 = bits, U32, 1072, [7:7] ; total TS size = 1076 -isPrime = bits, U32, 1076, [0:0] -engineTurnedRecently = bits, U32, 1076, [1:1] -isFuelPumpOn = bits, U32, 1076, [2:2] -ignitionOn = bits, U32, 1076, [3:3] +cranking1 = bits, U32, 1076, [0:0] +notRunning1 = bits, U32, 1076, [1:1] +disabledWhileEngineStopped1 = bits, U32, 1076, [2:2] +brokenClt1 = bits, U32, 1076, [3:3] +enabledForAc1 = bits, U32, 1076, [4:4] +hot1 = bits, U32, 1076, [5:5] +cold1 = bits, U32, 1076, [6:6] +disabledBySpeed1 = bits, U32, 1076, [7:7] ; total TS size = 1080 -isBenchTest = bits, U32, 1080, [0:0] -hasIgnitionVoltage = bits, U32, 1080, [1:1] -mainRelayState = bits, U32, 1080, [2:2] -delayedShutoffRequested = bits, U32, 1080, [3:3] +isPrime = bits, U32, 1080, [0:0] +engineTurnedRecently = bits, U32, 1080, [1:1] +isFuelPumpOn = bits, U32, 1080, [2:2] +ignitionOn = bits, U32, 1080, [3:3] ; total TS size = 1084 -lua_fuelAdd = scalar, F32, 1084, "g", 1, 0 -lua_fuelMult = scalar, F32, 1088, "", 1, 0 -lua_clutchUpState = bits, U32, 1092, [0:0] -lua_brakePedalState = bits, U32, 1092, [1:1] -lua_acRequestState = bits, U32, 1092, [2:2] -lua_luaDisableEtb = bits, U32, 1092, [3:3] -lua_luaIgnCut = bits, U32, 1092, [4:4] -sd_tCharge = scalar, S16, 1096, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1100, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1104, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1108, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1112, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1116, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1120, "", 1, 0 -hellenBoardId = scalar, S16, 1124, "id", 1, 0 -clutchUpState = scalar, S08, 1126, "", 1, 0 -clutchDownState = scalar, S08, 1127, "", 1, 0 -brakePedalState = scalar, S08, 1128, "", 1, 0 -startStopState = scalar, S08, 1129, "", 1, 0 -smartChipState = scalar, S08, 1130, "", 1, 0 -smartChipRestartCounter = scalar, S08, 1131, "", 1, 0 -smartChipAliveCounter = scalar, S08, 1132, "", 1, 0 -startStopPhysicalState = bits, U32, 1136, [0:0] -acrActive = bits, U32, 1136, [1:1] -acrEngineMovedRecently = bits, U32, 1136, [2:2] -heaterControlEnabled = bits, U32, 1136, [3:3] -luaDigitalState0 = bits, U32, 1136, [4:4] -luaDigitalState1 = bits, U32, 1136, [5:5] -luaDigitalState2 = bits, U32, 1136, [6:6] -luaDigitalState3 = bits, U32, 1136, [7:7] -startStopStateToggleCounter = scalar, U32, 1140, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1144, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1148, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1152, "", 1, 0 -desiredRpmLimit = scalar, S16, 1156, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1160, "", 1, 0 -globalSparkCounter = scalar, U32, 1164, "", 1, 0 -fuelingLoad = scalar, F32, 1168, "", 1, 0 -ignitionLoad = scalar, F32, 1172, "", 1, 0 -veTableYAxis = scalar, U16, 1176, "%", 0.01, 0 -; total TS size = 1180 -tpsFrom = scalar, F32, 1180 -tpsTo = scalar, F32, 1184 -deltaTps = scalar, F32, 1188 -extraFuel = scalar, F32, 1192, "", 1, 0 -valueFromTable = scalar, F32, 1196, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1200, [0:0] -isBelowDecelThreshold = bits, U32, 1200, [1:1] -isTimeToResetAccumulator = bits, U32, 1200, [2:2] -isFractionalEnrichment = bits, U32, 1200, [3:3] -belowEpsilon = bits, U32, 1200, [4:4] -tooShort = bits, U32, 1200, [5:5] -fractionalInjFuel = scalar, F32, 1204, "", 1, 0 -accumulatedValue = scalar, F32, 1208, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1212, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1216, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1220, "", 1, 0 -cycleCnt = scalar, S32, 1224, "", 1, 0 -; total TS size = 1228 -hwEventCounters1 = scalar, U32, 1228, "", 1, 0 -hwEventCounters2 = scalar, U32, 1232, "", 1, 0 -hwEventCounters3 = scalar, U32, 1236, "", 1, 0 -hwEventCounters4 = scalar, U32, 1240, "", 1, 0 -hwEventCounters5 = scalar, U32, 1244, "", 1, 0 -hwEventCounters6 = scalar, U32, 1248, "", 1, 0 -vvtCamCounter = scalar, U32, 1252, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1256, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1260, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1264, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1265, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1268, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1272, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1276, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1280, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1284, [0:0] -; total TS size = 1288 -crankSynchronizationCounter0 = scalar, U32, 1288, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1292, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1296, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1300, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1304, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1308, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1312, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1316, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1320, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1324, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1325, "", 1, 0 -; total TS size = 1328 -camResyncCounter = scalar, U08, 1328, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1332, [0:0] -; total TS size = 1336 -wallFuelCorrection = scalar, F32, 1336, "", 1, 0 -wallFuel = scalar, F32, 1340, "", 1, 0 -; total TS size = 1344 -idleState = bits, S32, 1344, [0:2], "not important" -currentIdlePosition = scalar, F32, 1348 -baseIdlePosition = scalar, F32, 1352 -idleClosedLoop = scalar, F32, 1356 -iacByTpsTaper = scalar, F32, 1360 -throttlePedalUpState = scalar, S32, 1364, "", 1, 0 -mightResetPid = bits, U32, 1368, [0:0] -shouldResetPid = bits, U32, 1368, [1:1] -wasResetPid = bits, U32, 1368, [2:2] -mustResetPid = bits, U32, 1368, [3:3] -isCranking = bits, U32, 1368, [4:4] -isIacTableForCoasting = bits, U32, 1368, [5:5] -notIdling = bits, U32, 1368, [6:6] -needReset = bits, U32, 1368, [7:7] -isInDeadZone = bits, U32, 1368, [8:8] -isBlipping = bits, U32, 1368, [9:9] -useClosedLoop = bits, U32, 1368, [10:10] -badTps = bits, U32, 1368, [11:11] -looksLikeRunning = bits, U32, 1368, [12:12] -looksLikeCoasting = bits, U32, 1368, [13:13] -looksLikeCrankToIdle = bits, U32, 1368, [14:14] -isIdleCoasting = bits, U32, 1368, [15:15] -isIdleClosedLoop = bits, U32, 1368, [16:16] -idleTarget = scalar, S32, 1372, "", 1, 0 -targetRpmByClt = scalar, S32, 1376, "", 1, 0 -targetRpmAc = scalar, S32, 1380, "", 1, 0 -iacByRpmTaper = scalar, F32, 1384 -luaAdd = scalar, F32, 1388 -; total TS size = 1392 -idlePosition0 = scalar, F32, 1392, "per", 1,0 -trim0 = scalar, F32, 1396, "", 1, 0 -luaAdjustment0 = scalar, F32, 1400, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1404, "per", 1,0 -etbFeedForward0 = scalar, F32, 1408 -etbIntegralError0 = scalar, F32, 1412, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1416, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1420, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1424, [0:0] -jamDetected0 = bits, U32, 1424, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1428, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1432, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1436, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1438, "count", 1,0 -etbErrorCode0 = scalar, S08, 1440, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1441, "", 1, 0 -jamTimer0 = scalar, U16, 1442, "sec", 0.01, 0 -; total TS size = 1444 -faultCode0 = scalar, U08, 1444, "", 1, 0 -heaterDuty0 = scalar, U08, 1445, "%", 1, 0 -pumpDuty0 = scalar, U08, 1446, "%", 1, 0 -tempC0 = scalar, U16, 1448, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1450, "V", 0.001, 0 -esr0 = scalar, U16, 1452, "ohm", 1, 0 -; total TS size = 1456 -dcOutput0 = scalar, F32, 1456, "per", 1,0 -isEnabled0_int = scalar, U08, 1460, "per", 1,0 -isEnabled0 = bits, U32, 1464, [0:0] -; total TS size = 1468 -value0 = scalar, U16, 1468, "value", 1,0 -value1 = scalar, U16, 1470, "value", 1,0 -errorRate = scalar, F32, 1472, "ratio", 1,0 -; total TS size = 1476 -vvtTarget = scalar, U16, 1476, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1478, "%", 0.5, 0 -; total TS size = 1480 -lambdaCurrentlyGood = bits, U32, 1480, [0:0] -lambdaMonitorCut = bits, U32, 1480, [1:1] -lambdaTimeSinceGood = scalar, U16, 1484, "sec", 0.01, 0 -; total TS size = 1488 +isBenchTest = bits, U32, 1084, [0:0] +hasIgnitionVoltage = bits, U32, 1084, [1:1] +mainRelayState = bits, U32, 1084, [2:2] +delayedShutoffRequested = bits, U32, 1084, [3:3] +; total TS size = 1088 +lua_fuelAdd = scalar, F32, 1088, "g", 1, 0 +lua_fuelMult = scalar, F32, 1092, "", 1, 0 +lua_clutchUpState = bits, U32, 1096, [0:0] +lua_brakePedalState = bits, U32, 1096, [1:1] +lua_acRequestState = bits, U32, 1096, [2:2] +lua_luaDisableEtb = bits, U32, 1096, [3:3] +lua_luaIgnCut = bits, U32, 1096, [4:4] +sd_tCharge = scalar, S16, 1100, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1104, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1108, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1112, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1116, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1120, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1124, "", 1, 0 +hellenBoardId = scalar, S16, 1128, "id", 1, 0 +clutchUpState = scalar, S08, 1130, "", 1, 0 +clutchDownState = scalar, S08, 1131, "", 1, 0 +brakePedalState = scalar, S08, 1132, "", 1, 0 +startStopState = scalar, S08, 1133, "", 1, 0 +smartChipState = scalar, S08, 1134, "", 1, 0 +smartChipRestartCounter = scalar, S08, 1135, "", 1, 0 +smartChipAliveCounter = scalar, S08, 1136, "", 1, 0 +startStopPhysicalState = bits, U32, 1140, [0:0] +acrActive = bits, U32, 1140, [1:1] +acrEngineMovedRecently = bits, U32, 1140, [2:2] +heaterControlEnabled = bits, U32, 1140, [3:3] +luaDigitalState0 = bits, U32, 1140, [4:4] +luaDigitalState1 = bits, U32, 1140, [5:5] +luaDigitalState2 = bits, U32, 1140, [6:6] +luaDigitalState3 = bits, U32, 1140, [7:7] +startStopStateToggleCounter = scalar, U32, 1144, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1148, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1152, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1156, "", 1, 0 +desiredRpmLimit = scalar, S16, 1160, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1164, "", 1, 0 +globalSparkCounter = scalar, U32, 1168, "", 1, 0 +fuelingLoad = scalar, F32, 1172, "", 1, 0 +ignitionLoad = scalar, F32, 1176, "", 1, 0 +veTableYAxis = scalar, U16, 1180, "%", 0.01, 0 +; total TS size = 1184 +tpsFrom = scalar, F32, 1184 +tpsTo = scalar, F32, 1188 +deltaTps = scalar, F32, 1192 +extraFuel = scalar, F32, 1196, "", 1, 0 +valueFromTable = scalar, F32, 1200, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1204, [0:0] +isBelowDecelThreshold = bits, U32, 1204, [1:1] +isTimeToResetAccumulator = bits, U32, 1204, [2:2] +isFractionalEnrichment = bits, U32, 1204, [3:3] +belowEpsilon = bits, U32, 1204, [4:4] +tooShort = bits, U32, 1204, [5:5] +fractionalInjFuel = scalar, F32, 1208, "", 1, 0 +accumulatedValue = scalar, F32, 1212, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1216, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1220, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1224, "", 1, 0 +cycleCnt = scalar, S32, 1228, "", 1, 0 +; total TS size = 1232 +hwEventCounters1 = scalar, U32, 1232, "", 1, 0 +hwEventCounters2 = scalar, U32, 1236, "", 1, 0 +hwEventCounters3 = scalar, U32, 1240, "", 1, 0 +hwEventCounters4 = scalar, U32, 1244, "", 1, 0 +hwEventCounters5 = scalar, U32, 1248, "", 1, 0 +hwEventCounters6 = scalar, U32, 1252, "", 1, 0 +vvtCamCounter = scalar, U32, 1256, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1260, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1264, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1268, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1269, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1272, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1276, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1280, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1284, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1288, [0:0] +; total TS size = 1292 +crankSynchronizationCounter0 = scalar, U32, 1292, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1296, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1300, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1304, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1308, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1312, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1316, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1320, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1324, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1328, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1329, "", 1, 0 +; total TS size = 1332 +crankSynchronizationCounter1 = scalar, U32, 1332, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1336, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1340, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1344, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1356, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1360, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1364, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1368, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1369, "", 1, 0 +; total TS size = 1372 +crankSynchronizationCounter2 = scalar, U32, 1372, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1376, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1380, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1384, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1396, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1400, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1404, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1408, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1409, "", 1, 0 +; total TS size = 1412 +crankSynchronizationCounter3 = scalar, U32, 1412, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1416, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1420, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1424, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1436, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1440, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1444, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1448, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1449, "", 1, 0 +; total TS size = 1452 +crankSynchronizationCounter4 = scalar, U32, 1452, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1456, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1460, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1464, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1476, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1480, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1484, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1488, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1489, "", 1, 0 +; total TS size = 1492 +camResyncCounter = scalar, U08, 1492, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1496, [0:0] +; total TS size = 1500 +wallFuelCorrection = scalar, F32, 1500, "", 1, 0 +wallFuel = scalar, F32, 1504, "", 1, 0 +; total TS size = 1508 +idleState = bits, S32, 1508, [0:2], "not important" +currentIdlePosition = scalar, F32, 1512 +baseIdlePosition = scalar, F32, 1516 +idleClosedLoop = scalar, F32, 1520 +iacByTpsTaper = scalar, F32, 1524 +throttlePedalUpState = scalar, S32, 1528, "", 1, 0 +mightResetPid = bits, U32, 1532, [0:0] +shouldResetPid = bits, U32, 1532, [1:1] +wasResetPid = bits, U32, 1532, [2:2] +mustResetPid = bits, U32, 1532, [3:3] +isCranking = bits, U32, 1532, [4:4] +isIacTableForCoasting = bits, U32, 1532, [5:5] +notIdling = bits, U32, 1532, [6:6] +needReset = bits, U32, 1532, [7:7] +isInDeadZone = bits, U32, 1532, [8:8] +isBlipping = bits, U32, 1532, [9:9] +useClosedLoop = bits, U32, 1532, [10:10] +badTps = bits, U32, 1532, [11:11] +looksLikeRunning = bits, U32, 1532, [12:12] +looksLikeCoasting = bits, U32, 1532, [13:13] +looksLikeCrankToIdle = bits, U32, 1532, [14:14] +isIdleCoasting = bits, U32, 1532, [15:15] +isIdleClosedLoop = bits, U32, 1532, [16:16] +idleTarget = scalar, S32, 1536, "", 1, 0 +targetRpmByClt = scalar, S32, 1540, "", 1, 0 +targetRpmAc = scalar, S32, 1544, "", 1, 0 +iacByRpmTaper = scalar, F32, 1548 +luaAdd = scalar, F32, 1552 +; total TS size = 1556 +idlePosition0 = scalar, F32, 1556, "per", 1,0 +trim0 = scalar, F32, 1560, "", 1, 0 +luaAdjustment0 = scalar, F32, 1564, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1568, "per", 1,0 +etbFeedForward0 = scalar, F32, 1572 +etbIntegralError0 = scalar, F32, 1576, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1580, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1584, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1588, [0:0] +jamDetected0 = bits, U32, 1588, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1592, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1596, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1600, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1602, "count", 1,0 +etbErrorCode0 = scalar, S08, 1604, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1605, "", 1, 0 +jamTimer0 = scalar, U16, 1606, "sec", 0.01, 0 +; total TS size = 1608 +idlePosition1 = scalar, F32, 1608, "per", 1,0 +trim1 = scalar, F32, 1612, "", 1, 0 +luaAdjustment1 = scalar, F32, 1616, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1620, "per", 1,0 +etbFeedForward1 = scalar, F32, 1624 +etbIntegralError1 = scalar, F32, 1628, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1632, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1636, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1640, [0:0] +jamDetected1 = bits, U32, 1640, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1644, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1648, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1652, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1654, "count", 1,0 +etbErrorCode1 = scalar, S08, 1656, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1657, "", 1, 0 +jamTimer1 = scalar, U16, 1658, "sec", 0.01, 0 +; total TS size = 1660 +faultCode0 = scalar, U08, 1660, "", 1, 0 +heaterDuty0 = scalar, U08, 1661, "%", 1, 0 +pumpDuty0 = scalar, U08, 1662, "%", 1, 0 +tempC0 = scalar, U16, 1664, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1666, "V", 0.001, 0 +esr0 = scalar, U16, 1668, "ohm", 1, 0 +; total TS size = 1672 +faultCode1 = scalar, U08, 1672, "", 1, 0 +heaterDuty1 = scalar, U08, 1673, "%", 1, 0 +pumpDuty1 = scalar, U08, 1674, "%", 1, 0 +tempC1 = scalar, U16, 1676, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1678, "V", 0.001, 0 +esr1 = scalar, U16, 1680, "ohm", 1, 0 +; total TS size = 1684 +dcOutput0 = scalar, F32, 1684, "per", 1,0 +isEnabled0_int = scalar, U08, 1688, "per", 1,0 +isEnabled0 = bits, U32, 1692, [0:0] +; total TS size = 1696 +value0 = scalar, U16, 1696, "value", 1,0 +value1 = scalar, U16, 1698, "value", 1,0 +errorRate = scalar, F32, 1700, "ratio", 1,0 +; total TS size = 1704 +vvtTarget = scalar, U16, 1704, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1706, "%", 0.5, 0 +; total TS size = 1708 +lambdaCurrentlyGood = bits, U32, 1708, [0:0] +lambdaMonitorCut = bits, U32, 1708, [1:1] +lambdaTimeSinceGood = scalar, U16, 1712, "sec", 0.01, 0 +; total TS size = 1716 time = { timeNow } @@ -4485,6 +4567,13 @@ etbDutyRateOfChange0Gauge = etbDutyRateOfChange0,"ETB duty rate of change0", "pe etbDutyAverage0Gauge = etbDutyAverage0,"ETB average duty0", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 etbTpsErrorCounter0Gauge = etbTpsErrorCounter0,"ETB TPS error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 etbPpsErrorCounter0Gauge = etbPpsErrorCounter0,"ETB pedal error counter0", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +idlePosition1Gauge = idlePosition1,"ETB: idlePosition1", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 +luaAdjustment1Gauge = luaAdjustment1,"ETB: luaAdjustment1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +m_wastegatePosition1Gauge = m_wastegatePosition1,"DC: wastegatePosition1", "per", 0.0,3.0, 0.0,3.0, 0.0,3.0, 2,2 +etbDutyRateOfChange1Gauge = etbDutyRateOfChange1,"ETB duty rate of change1", "per", 0.0,25.0, 0.0,25.0, 0.0,25.0, 2,2 +etbDutyAverage1Gauge = etbDutyAverage1,"ETB average duty1", "per", -20.0,50.0, -20.0,50.0, -20.0,50.0, 2,2 +etbTpsErrorCounter1Gauge = etbTpsErrorCounter1,"ETB TPS error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 +etbPpsErrorCounter1Gauge = etbPpsErrorCounter1,"ETB pedal error counter1", "count", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 dcOutput0Gauge = dcOutput0,"DC: output0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 isEnabled0_intGauge = isEnabled0_int,"DC: en0", "per", 0.0,10.0, 0.0,10.0, 0.0,10.0, 2,2 value0Gauge = value0,"ETB: SENT value0", "value", 0.0,3.0, 0.0,3.0, 0.0,3.0, 0,0 @@ -5424,14 +5513,14 @@ entry = enabledForAc0, "enabledForAc0", int, "%d" entry = hot0, "hot0", int, "%d" entry = cold0, "cold0", int, "%d" entry = disabledBySpeed0, "disabledBySpeed0", int, "%d" -;entry = cranking1, "cranking1", int, "%d" -;entry = notRunning1, "notRunning1", int, "%d" -;entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d" -;entry = brokenClt1, "brokenClt1", int, "%d" -;entry = enabledForAc1, "enabledForAc1", int, "%d" -;entry = hot1, "hot1", int, "%d" -;entry = cold1, "cold1", int, "%d" -;entry = disabledBySpeed1, "disabledBySpeed1", int, "%d" +entry = cranking1, "cranking1", int, "%d" +entry = notRunning1, "notRunning1", int, "%d" +entry = disabledWhileEngineStopped1, "disabledWhileEngineStopped1", int, "%d" +entry = brokenClt1, "brokenClt1", int, "%d" +entry = enabledForAc1, "enabledForAc1", int, "%d" +entry = hot1, "hot1", int, "%d" +entry = cold1, "cold1", int, "%d" +entry = disabledBySpeed1, "disabledBySpeed1", int, "%d" entry = isPrime, "isPrime", int, "%d" entry = engineTurnedRecently, "engineTurnedRecently", int, "%d" entry = isFuelPumpOn, "isFuelPumpOn", int, "%d" @@ -5524,50 +5613,50 @@ entry = vvtToothPosition40, "vvtToothPosition 40", float, "%.3f" entry = triggerSyncGapRatio0, "Trigger Sync Latest Ratio0", float, "%.3f" entry = triggerStateIndex0, "triggerStateIndex0", int, "%d" entry = vvtStateIndex0, "vvtStateIndex0", int, "%d" -;entry = crankSynchronizationCounter1, "sync: Crank sync counter1", int, "%d" -;entry = vvtSyncGapRatio1, "vvtSyncGapRatio1", float, "%.3f" -;entry = vvtToothDurations01, "vvtToothDurations01", int, "%d" -;entry = vvtCurrentPosition1, "vvtCurrentPosition1", float, "%.3f" -;entry = vvtToothPosition11, "vvtToothPosition 11", float, "%.3f" -;entry = vvtToothPosition21, "vvtToothPosition 21", float, "%.3f" -;entry = vvtToothPosition31, "vvtToothPosition 31", float, "%.3f" -;entry = vvtToothPosition41, "vvtToothPosition 41", float, "%.3f" -;entry = triggerSyncGapRatio1, "Trigger Sync Latest Ratio1", float, "%.3f" -;entry = triggerStateIndex1, "triggerStateIndex1", int, "%d" -;entry = vvtStateIndex1, "vvtStateIndex1", int, "%d" -;entry = crankSynchronizationCounter2, "sync: Crank sync counter2", int, "%d" -;entry = vvtSyncGapRatio2, "vvtSyncGapRatio2", float, "%.3f" -;entry = vvtToothDurations02, "vvtToothDurations02", int, "%d" -;entry = vvtCurrentPosition2, "vvtCurrentPosition2", float, "%.3f" -;entry = vvtToothPosition12, "vvtToothPosition 12", float, "%.3f" -;entry = vvtToothPosition22, "vvtToothPosition 22", float, "%.3f" -;entry = vvtToothPosition32, "vvtToothPosition 32", float, "%.3f" -;entry = vvtToothPosition42, "vvtToothPosition 42", float, "%.3f" -;entry = triggerSyncGapRatio2, "Trigger Sync Latest Ratio2", float, "%.3f" -;entry = triggerStateIndex2, "triggerStateIndex2", int, "%d" -;entry = vvtStateIndex2, "vvtStateIndex2", int, "%d" -;entry = crankSynchronizationCounter3, "sync: Crank sync counter3", int, "%d" -;entry = vvtSyncGapRatio3, "vvtSyncGapRatio3", float, "%.3f" -;entry = vvtToothDurations03, "vvtToothDurations03", int, "%d" -;entry = vvtCurrentPosition3, "vvtCurrentPosition3", float, "%.3f" -;entry = vvtToothPosition13, "vvtToothPosition 13", float, "%.3f" -;entry = vvtToothPosition23, "vvtToothPosition 23", float, "%.3f" -;entry = vvtToothPosition33, "vvtToothPosition 33", float, "%.3f" -;entry = vvtToothPosition43, "vvtToothPosition 43", float, "%.3f" -;entry = triggerSyncGapRatio3, "Trigger Sync Latest Ratio3", float, "%.3f" -;entry = triggerStateIndex3, "triggerStateIndex3", int, "%d" -;entry = vvtStateIndex3, "vvtStateIndex3", int, "%d" -;entry = crankSynchronizationCounter4, "sync: Crank sync counter4", int, "%d" -;entry = vvtSyncGapRatio4, "vvtSyncGapRatio4", float, "%.3f" -;entry = vvtToothDurations04, "vvtToothDurations04", int, "%d" -;entry = vvtCurrentPosition4, "vvtCurrentPosition4", float, "%.3f" -;entry = vvtToothPosition14, "vvtToothPosition 14", float, "%.3f" -;entry = vvtToothPosition24, "vvtToothPosition 24", float, "%.3f" -;entry = vvtToothPosition34, "vvtToothPosition 34", float, "%.3f" -;entry = vvtToothPosition44, "vvtToothPosition 44", float, "%.3f" -;entry = triggerSyncGapRatio4, "Trigger Sync Latest Ratio4", float, "%.3f" -;entry = triggerStateIndex4, "triggerStateIndex4", int, "%d" -;entry = vvtStateIndex4, "vvtStateIndex4", int, "%d" +entry = crankSynchronizationCounter1, "sync: Crank sync counter1", int, "%d" +entry = vvtSyncGapRatio1, "vvtSyncGapRatio1", float, "%.3f" +entry = vvtToothDurations01, "vvtToothDurations01", int, "%d" +entry = vvtCurrentPosition1, "vvtCurrentPosition1", float, "%.3f" +entry = vvtToothPosition11, "vvtToothPosition 11", float, "%.3f" +entry = vvtToothPosition21, "vvtToothPosition 21", float, "%.3f" +entry = vvtToothPosition31, "vvtToothPosition 31", float, "%.3f" +entry = vvtToothPosition41, "vvtToothPosition 41", float, "%.3f" +entry = triggerSyncGapRatio1, "Trigger Sync Latest Ratio1", float, "%.3f" +entry = triggerStateIndex1, "triggerStateIndex1", int, "%d" +entry = vvtStateIndex1, "vvtStateIndex1", int, "%d" +entry = crankSynchronizationCounter2, "sync: Crank sync counter2", int, "%d" +entry = vvtSyncGapRatio2, "vvtSyncGapRatio2", float, "%.3f" +entry = vvtToothDurations02, "vvtToothDurations02", int, "%d" +entry = vvtCurrentPosition2, "vvtCurrentPosition2", float, "%.3f" +entry = vvtToothPosition12, "vvtToothPosition 12", float, "%.3f" +entry = vvtToothPosition22, "vvtToothPosition 22", float, "%.3f" +entry = vvtToothPosition32, "vvtToothPosition 32", float, "%.3f" +entry = vvtToothPosition42, "vvtToothPosition 42", float, "%.3f" +entry = triggerSyncGapRatio2, "Trigger Sync Latest Ratio2", float, "%.3f" +entry = triggerStateIndex2, "triggerStateIndex2", int, "%d" +entry = vvtStateIndex2, "vvtStateIndex2", int, "%d" +entry = crankSynchronizationCounter3, "sync: Crank sync counter3", int, "%d" +entry = vvtSyncGapRatio3, "vvtSyncGapRatio3", float, "%.3f" +entry = vvtToothDurations03, "vvtToothDurations03", int, "%d" +entry = vvtCurrentPosition3, "vvtCurrentPosition3", float, "%.3f" +entry = vvtToothPosition13, "vvtToothPosition 13", float, "%.3f" +entry = vvtToothPosition23, "vvtToothPosition 23", float, "%.3f" +entry = vvtToothPosition33, "vvtToothPosition 33", float, "%.3f" +entry = vvtToothPosition43, "vvtToothPosition 43", float, "%.3f" +entry = triggerSyncGapRatio3, "Trigger Sync Latest Ratio3", float, "%.3f" +entry = triggerStateIndex3, "triggerStateIndex3", int, "%d" +entry = vvtStateIndex3, "vvtStateIndex3", int, "%d" +entry = crankSynchronizationCounter4, "sync: Crank sync counter4", int, "%d" +entry = vvtSyncGapRatio4, "vvtSyncGapRatio4", float, "%.3f" +entry = vvtToothDurations04, "vvtToothDurations04", int, "%d" +entry = vvtCurrentPosition4, "vvtCurrentPosition4", float, "%.3f" +entry = vvtToothPosition14, "vvtToothPosition 14", float, "%.3f" +entry = vvtToothPosition24, "vvtToothPosition 24", float, "%.3f" +entry = vvtToothPosition34, "vvtToothPosition 34", float, "%.3f" +entry = vvtToothPosition44, "vvtToothPosition 44", float, "%.3f" +entry = triggerSyncGapRatio4, "Trigger Sync Latest Ratio4", float, "%.3f" +entry = triggerStateIndex4, "triggerStateIndex4", int, "%d" +entry = vvtStateIndex4, "vvtStateIndex4", int, "%d" entry = camResyncCounter, "sync: Phase Re-Sync Counter", int, "%d" entry = m_hasSynchronizedPhase, "sync: Known Engine Phase", int, "%d" entry = wallFuelCorrection, "fuel wallwetting injection time", float, "%.3f" @@ -5617,35 +5706,35 @@ entry = etbPpsErrorCounter0, "ETB pedal error counter0", int, "%d" entry = etbErrorCode0, "etbErrorCode0", int, "%d" entry = tcEtbDrop0, "tcEtbDrop0", int, "%d" entry = jamTimer0, "ETB jam timer0", float, "%.3f" -;entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" -;entry = trim1, "ETB: trim1", float, "%.3f" -;entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" -;entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" -;entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" -;entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" -;entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" -;entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" -;entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" -;entry = jamDetected1, "jamDetected1", int, "%d" -;entry = etbDutyRateOfChange1, "ETB duty rate of change1", float, "%.3f" -;entry = etbDutyAverage1, "ETB average duty1", float, "%.3f" -;entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" -;entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" -;entry = etbErrorCode1, "etbErrorCode1", int, "%d" -;entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" -;entry = jamTimer1, "ETB jam timer1", float, "%.3f" +entry = idlePosition1, "ETB: idlePosition1", float, "%.3f" +entry = trim1, "ETB: trim1", float, "%.3f" +entry = luaAdjustment1, "ETB: luaAdjustment1", float, "%.3f" +entry = m_wastegatePosition1, "DC: wastegatePosition1", float, "%.3f" +entry = etbFeedForward1, "etbFeedForward1", float, "%.3f" +entry = etbIntegralError1, "etbIntegralError1", float, "%.3f" +entry = etbCurrentTarget1, "etbCurrentTarget1", float, "%.3f" +entry = etbCurrentAdjustedTarget1, "etbCurrentAdjustedTarget1", float, "%.3f" +entry = etbRevLimitActive1, "etbRevLimitActive1", int, "%d" +entry = jamDetected1, "jamDetected1", int, "%d" +entry = etbDutyRateOfChange1, "ETB duty rate of change1", float, "%.3f" +entry = etbDutyAverage1, "ETB average duty1", float, "%.3f" +entry = etbTpsErrorCounter1, "ETB TPS error counter1", int, "%d" +entry = etbPpsErrorCounter1, "ETB pedal error counter1", int, "%d" +entry = etbErrorCode1, "etbErrorCode1", int, "%d" +entry = tcEtbDrop1, "tcEtbDrop1", int, "%d" +entry = jamTimer1, "ETB jam timer1", float, "%.3f" entry = faultCode0, "WBO: Fault code0", int, "%d" entry = heaterDuty0, "WBO: Heater duty0", int, "%d" entry = pumpDuty0, "WBO: Pump duty0", int, "%d" entry = tempC0, "WBO: Temperature0", int, "%d" entry = nernstVoltage0, "WBO: Nernst Voltage0", float, "%.3f" entry = esr0, "WBO: ESR0", int, "%d" -;entry = faultCode1, "WBO: Fault code1", int, "%d" -;entry = heaterDuty1, "WBO: Heater duty1", int, "%d" -;entry = pumpDuty1, "WBO: Pump duty1", int, "%d" -;entry = tempC1, "WBO: Temperature1", int, "%d" -;entry = nernstVoltage1, "WBO: Nernst Voltage1", float, "%.3f" -;entry = esr1, "WBO: ESR1", int, "%d" +entry = faultCode1, "WBO: Fault code1", int, "%d" +entry = heaterDuty1, "WBO: Heater duty1", int, "%d" +entry = pumpDuty1, "WBO: Pump duty1", int, "%d" +entry = tempC1, "WBO: Temperature1", int, "%d" +entry = nernstVoltage1, "WBO: Nernst Voltage1", float, "%.3f" +entry = esr1, "WBO: ESR1", int, "%d" entry = dcOutput0, "DC: output0", float, "%.3f" entry = isEnabled0_int, "DC: en0", int, "%d" entry = isEnabled0, "isEnabled0", int, "%d" @@ -5992,17 +6081,24 @@ menuDialog = main subMenu = boost_controlDialog, "boost_control" subMenu = ac_controlDialog, "ac_control" subMenu = fan_control0Dialog, "fan_control0" + subMenu = fan_control1Dialog, "fan_control1" 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_state0Dialog, "trigger_state0" + subMenu = trigger_state1Dialog, "trigger_state1" + subMenu = trigger_state2Dialog, "trigger_state2" + subMenu = trigger_state3Dialog, "trigger_state3" + subMenu = trigger_state4Dialog, "trigger_state4" subMenu = trigger_state_primaryDialog, "trigger_state_primary" subMenu = wall_fuel_stateDialog, "wall_fuel_state" subMenu = idle_stateDialog, "idle_state" subMenu = electronic_throttle0Dialog, "electronic_throttle0" + subMenu = electronic_throttle1Dialog, "electronic_throttle1" subMenu = wideband_state0Dialog, "wideband_state0" + subMenu = wideband_state1Dialog, "wideband_state1" subMenu = dc_motorsDialog, "dc_motors" subMenu = sent_stateDialog, "sent_state" subMenu = vvtDialog, "vvt" @@ -6379,6 +6475,19 @@ indicatorPanel = fan_control0IndicatorPanel, 2 dialog = fan_control0Dialog, "fan_control0" panel = fan_control0IndicatorPanel +indicatorPanel = fan_control1IndicatorPanel, 2 + indicator = {cranking1}, "cranking No", "cranking Yes" + indicator = {notRunning1}, "notRunning No", "notRunning Yes" + indicator = {disabledWhileEngineStopped1}, "disabledWhileEngineStopped No", "disabledWhileEngineStopped Yes" + indicator = {brokenClt1}, "brokenClt No", "brokenClt Yes" + indicator = {enabledForAc1}, "enabledForAc No", "enabledForAc Yes" + indicator = {hot1}, "hot No", "hot Yes" + indicator = {cold1}, "cold No", "cold Yes" + indicator = {disabledBySpeed1}, "disabledBySpeed No", "disabledBySpeed Yes" + +dialog = fan_control1Dialog, "fan_control1" + panel = fan_control1IndicatorPanel + indicatorPanel = fuel_pump_controlIndicatorPanel, 2 indicator = {isPrime}, "isPrime No", "isPrime Yes" indicator = {engineTurnedRecently}, "engineTurnedRecently No", "engineTurnedRecently Yes" @@ -6516,6 +6625,74 @@ dialog = trigger_state0Dialog, "trigger_state0" graphLine = triggerStateIndex0 graphLine = vvtStateIndex0 + +dialog = trigger_state1Dialog, "trigger_state1" + liveGraph = trigger_state1_1_Graph, "Graph", South + graphLine = crankSynchronizationCounter1 + graphLine = vvtSyncGapRatio1 + graphLine = vvtToothDurations01 + graphLine = vvtCurrentPosition1 + liveGraph = trigger_state1_2_Graph, "Graph", South + graphLine = vvtToothPosition11 + graphLine = vvtToothPosition21 + graphLine = vvtToothPosition31 + graphLine = vvtToothPosition41 + liveGraph = trigger_state1_3_Graph, "Graph", South + graphLine = triggerSyncGapRatio1 + graphLine = triggerStateIndex1 + graphLine = vvtStateIndex1 + + +dialog = trigger_state2Dialog, "trigger_state2" + liveGraph = trigger_state2_1_Graph, "Graph", South + graphLine = crankSynchronizationCounter2 + graphLine = vvtSyncGapRatio2 + graphLine = vvtToothDurations02 + graphLine = vvtCurrentPosition2 + liveGraph = trigger_state2_2_Graph, "Graph", South + graphLine = vvtToothPosition12 + graphLine = vvtToothPosition22 + graphLine = vvtToothPosition32 + graphLine = vvtToothPosition42 + liveGraph = trigger_state2_3_Graph, "Graph", South + graphLine = triggerSyncGapRatio2 + graphLine = triggerStateIndex2 + graphLine = vvtStateIndex2 + + +dialog = trigger_state3Dialog, "trigger_state3" + liveGraph = trigger_state3_1_Graph, "Graph", South + graphLine = crankSynchronizationCounter3 + graphLine = vvtSyncGapRatio3 + graphLine = vvtToothDurations03 + graphLine = vvtCurrentPosition3 + liveGraph = trigger_state3_2_Graph, "Graph", South + graphLine = vvtToothPosition13 + graphLine = vvtToothPosition23 + graphLine = vvtToothPosition33 + graphLine = vvtToothPosition43 + liveGraph = trigger_state3_3_Graph, "Graph", South + graphLine = triggerSyncGapRatio3 + graphLine = triggerStateIndex3 + graphLine = vvtStateIndex3 + + +dialog = trigger_state4Dialog, "trigger_state4" + liveGraph = trigger_state4_1_Graph, "Graph", South + graphLine = crankSynchronizationCounter4 + graphLine = vvtSyncGapRatio4 + graphLine = vvtToothDurations04 + graphLine = vvtCurrentPosition4 + liveGraph = trigger_state4_2_Graph, "Graph", South + graphLine = vvtToothPosition14 + graphLine = vvtToothPosition24 + graphLine = vvtToothPosition34 + graphLine = vvtToothPosition44 + liveGraph = trigger_state4_3_Graph, "Graph", South + graphLine = triggerSyncGapRatio4 + graphLine = triggerStateIndex4 + graphLine = vvtStateIndex4 + indicatorPanel = trigger_state_primaryIndicatorPanel, 2 indicator = {m_hasSynchronizedPhase}, "m_hasSynchronizedPhase No", "m_hasSynchronizedPhase Yes" @@ -6592,6 +6769,32 @@ dialog = electronic_throttle0Dialog, "electronic_throttle0" graphLine = tcEtbDrop0 graphLine = jamTimer0 +indicatorPanel = electronic_throttle1IndicatorPanel, 2 + indicator = {etbRevLimitActive1}, "etbRevLimitActive No", "etbRevLimitActive Yes" + indicator = {jamDetected1}, "jamDetected No", "jamDetected Yes" + +dialog = electronic_throttle1Dialog, "electronic_throttle1" + panel = electronic_throttle1IndicatorPanel + liveGraph = electronic_throttle1_1_Graph, "Graph", South + graphLine = idlePosition1 + graphLine = trim1 + graphLine = luaAdjustment1 + graphLine = m_wastegatePosition1 + liveGraph = electronic_throttle1_2_Graph, "Graph", South + graphLine = etbFeedForward1 + graphLine = etbIntegralError1 + graphLine = etbCurrentTarget1 + graphLine = etbCurrentAdjustedTarget1 + liveGraph = electronic_throttle1_3_Graph, "Graph", South + graphLine = etbDutyRateOfChange1 + graphLine = etbDutyAverage1 + graphLine = etbTpsErrorCounter1 + graphLine = etbPpsErrorCounter1 + liveGraph = electronic_throttle1_4_Graph, "Graph", South + graphLine = etbErrorCode1 + graphLine = tcEtbDrop1 + graphLine = jamTimer1 + dialog = wideband_state0Dialog, "wideband_state0" liveGraph = wideband_state0_1_Graph, "Graph", South @@ -6603,6 +6806,17 @@ dialog = wideband_state0Dialog, "wideband_state0" graphLine = nernstVoltage0 graphLine = esr0 + +dialog = wideband_state1Dialog, "wideband_state1" + liveGraph = wideband_state1_1_Graph, "Graph", South + graphLine = faultCode1 + graphLine = heaterDuty1 + graphLine = pumpDuty1 + graphLine = tempC1 + liveGraph = wideband_state1_2_Graph, "Graph", South + graphLine = nernstVoltage1 + graphLine = esr1 + indicatorPanel = dc_motorsIndicatorPanel, 2 indicator = {isEnabled0}, "isEnabled0 No", "isEnabled0 Yes" @@ -6718,15 +6932,15 @@ dialog = lambda_monitorDialog, "lambda_monitor" field = "Ignition Output 1", ignitionPins1, {isIgnitionEnabled == 1} ; see rusefi_config.txt comment next to 'ignitionPin2logic' which says ; this section is auto-generated by FiringOrderTSLogic.java - field = "Ignition Output 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29)))} + field = "Ignition Output 2", ignitionPins2, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 2) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 2) || (firingOrder == 7) || (firingOrder == 9) || (firingOrder == 11) || (firingOrder == 12) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 29) || (firingOrder == 33)))} field = "Ignition Output 3", ignitionPins3, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 3) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 1) || (firingOrder == 3) || (firingOrder == 4) || (firingOrder == 5) || (firingOrder == 9) || (firingOrder == 13) || (firingOrder == 14) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 20) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 27) || (firingOrder == 28)))} field = "Ignition Output 4", ignitionPins4, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 4) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 7) || (firingOrder == 12) || (firingOrder == 14) || (firingOrder == 16) || (firingOrder == 17) || (firingOrder == 22) || (firingOrder == 23) || (firingOrder == 25) || (firingOrder == 26) || (firingOrder == 27) || (firingOrder == 31) || (firingOrder == 32)))} - field = "Ignition Output 5", ignitionPins5, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 23) || (firingOrder == 26) || (firingOrder == 30) || (firingOrder == 31) || (firingOrder == 32)))} - field = "Ignition Output 6", ignitionPins6, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 13) || (firingOrder == 22) || (firingOrder == 23) || (firingOrder == 29) || (firingOrder == 30)))} + field = "Ignition Output 5", ignitionPins5, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 5) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 4) || (firingOrder == 12) || (firingOrder == 15) || (firingOrder == 18) || (firingOrder == 23) || (firingOrder == 26) || (firingOrder == 30) || (firingOrder == 31) || (firingOrder == 32) || (firingOrder == 33)))} + field = "Ignition Output 6", ignitionPins6, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 6) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 13) || (firingOrder == 22) || (firingOrder == 23) || (firingOrder == 29) || (firingOrder == 30) || (firingOrder == 33)))} field = "Ignition Output 7", ignitionPins7, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 7) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 11) || (firingOrder == 15) || (firingOrder == 16) || (firingOrder == 19) || (firingOrder == 20) || (firingOrder == 22) || (firingOrder == 28)))} field = "Ignition Output 8", ignitionPins8, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 8) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 5) || (firingOrder == 11) || (firingOrder == 16) || (firingOrder == 18) || (firingOrder == 19) || (firingOrder == 26) || (firingOrder == 28) || (firingOrder == 32)))} field = "Ignition Output 9", ignitionPins9, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 9) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 15) || (firingOrder == 22)))} - field = "Ignition Output 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18)))} + field = "Ignition Output 10", ignitionPins10, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 10) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 14) || (firingOrder == 16) || (firingOrder == 18) || (firingOrder == 33)))} field = "Ignition Output 11", ignitionPins11, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 11) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 15)))} field = "Ignition Output 12", ignitionPins12, {isIgnitionEnabled == 1 && (ignitionMode != 0 && cylindersCount >= 12) && (ignitionMode !=2 || twoWireBatchIgnition == 1 || ((firingOrder == 18) || (firingOrder == 22)))}