diff --git a/generated/controllers/generated/rusefi_generated_paralela.h b/generated/controllers/generated/rusefi_generated_paralela.h index c083d99..e518e5f 100644 --- a/generated/controllers/generated/rusefi_generated_paralela.h +++ b/generated/controllers/generated/rusefi_generated_paralela.h @@ -1296,7 +1296,7 @@ #define show_Proteus_presets false #define show_test_presets false #define show_vvt_output_pin true -#define SIGNATURE_HASH 2244165552 +#define SIGNATURE_HASH 4070339526 #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" @@ -1475,11 +1475,13 @@ #define TRIGGERS_FILE_NAME "triggers.txt" #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 -#define ts_14_command_TS_14_0 0 -#define ts_14_command_TS_14_1 1 -#define ts_14_command_TS_14_4 4 -#define ts_14_command_TS_14_5 5 -#define ts_14_command_TS_14_9 9 +#define ts_14_command_COMMAND_X14_UNUSED_0 0x00 +#define ts_14_command_COMMAND_X14_UNUSED_1 0x01 +#define ts_14_command_COMMAND_X14_UNUSED_2 0x02 +#define ts_14_command_COMMAND_X14_UNUSED_3 0x03 +#define ts_14_command_COMMAND_X14_UNUSED_4 0x04 +#define ts_14_command_COMMAND_X14_UNUSED_5 0x05 +#define ts_14_command_COMMAND_X14_UNUSED_9 0x09 #define ts_14_command_TS_BURN_WITHOUT_FLASH 0x15 #define ts_14_command_TS_ETB_AUTOCAL_0 0x0E #define ts_14_command_TS_ETB_AUTOCAL_1 0x11 @@ -1489,8 +1491,6 @@ #define ts_14_command_TS_EXTERNAL_TRIGGER_STIMULATOR_ENABLE 0x13 #define ts_14_command_TS_GRAB_PEDAL_UP 6 #define ts_14_command_TS_GRAB_PEDAL_WOT 7 -#define ts_14_command_TS_GRAB_TPS_CLOSED 2 -#define ts_14_command_TS_GRAB_TPS_WOT 3 #define ts_14_command_TS_RESET_MC33810 0x14 #define ts_14_command_TS_RESET_TLE8888 8 #define ts_14_command_TS_TRIGGER_STIMULATOR_DISABLE 0x0F @@ -1741,14 +1741,14 @@ #define ts_show_wastegate_sensor true #define ts_show_wbo_canbus_index true #define ts_show_wbo_canbus_set_index true -#define TS_SIGNATURE "rusEFI master.2024.08.13.paralela.2244165552" +#define TS_SIGNATURE "rusEFI master.2024.08.14.paralela.4070339526" #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 1756 +#define TS_TOTAL_OUTPUT_SIZE 1752 #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_paralela.h b/generated/controllers/generated/signature_paralela.h index 3337e4e..53e1864 100644 --- a/generated/controllers/generated/signature_paralela.h +++ b/generated/controllers/generated/signature_paralela.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 2244165552 -#define TS_SIGNATURE "rusEFI master.2024.08.13.paralela.2244165552" +#define SIGNATURE_HASH 4070339526 +#define TS_SIGNATURE "rusEFI master.2024.08.14.paralela.4070339526" diff --git a/generated/tunerstudio/generated/rusefi_paralela.ini b/generated/tunerstudio/generated/rusefi_paralela.ini index 09426b0..c817211 100644 --- a/generated/tunerstudio/generated/rusefi_paralela.ini +++ b/generated/tunerstudio/generated/rusefi_paralela.ini @@ -38,12 +38,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2024.08.13.paralela.2244165552" + signature = "rusEFI master.2024.08.14.paralela.4070339526" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2024.08.13.paralela.2244165552" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2024.08.14.paralela.4070339526" ; 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="NONE","TPS (A0)","MAP (A1)","CLT (A2)","INVALID","INVALID","TPS (A5)","INVALID","INVALID","O2-2 (B0)","INVALID","INVALID","BattV (C1)","IAT (C2)","O2-1 (C3)","PPS1 (C4)","PPS2 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Tue Aug 13 21:12:00 UTC 2024 +; this section was generated automatically by rusEFI tool config_definition-all.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 14 21:13:00 UTC 2024 pageSize = 25072 page = 1 @@ -2539,7 +2539,7 @@ minimumOilPressureValues = array, U08, 25064, [8], "kPa", 10.0, 0, 0, 1000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1756 + ochBlockSize = 1752 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -3166,284 +3166,283 @@ isDisabledByLua = bits, U32, 1084, [6:6] acCompressorState = bits, U32, 1084, [7:7] acPressureTooLow = bits, U32, 1084, [8:8] acPressureTooHigh = bits, U32, 1084, [9:9] -latest_usage_ac_control = scalar, S32, 1088, "", 1, 0 -acSwitchLastChangeTimeMs = scalar, S32, 1092, "", 1, 0 -; total TS size = 1096 -cranking0 = bits, U32, 1096, [0:0] -notRunning0 = bits, U32, 1096, [1:1] -disabledWhileEngineStopped0 = bits, U32, 1096, [2:2] -brokenClt0 = bits, U32, 1096, [3:3] -enabledForAc0 = bits, U32, 1096, [4:4] -hot0 = bits, U32, 1096, [5:5] -cold0 = bits, U32, 1096, [6:6] -disabledBySpeed0 = bits, U32, 1096, [7:7] -tempAlive0 = scalar, U08, 1100, "", 1, 0 -tempCode0 = scalar, U08, 1101, "", 1, 0 -; total TS size = 1104 -cranking1 = bits, U32, 1104, [0:0] -notRunning1 = bits, U32, 1104, [1:1] -disabledWhileEngineStopped1 = bits, U32, 1104, [2:2] -brokenClt1 = bits, U32, 1104, [3:3] -enabledForAc1 = bits, U32, 1104, [4:4] -hot1 = bits, U32, 1104, [5:5] -cold1 = bits, U32, 1104, [6:6] -disabledBySpeed1 = bits, U32, 1104, [7:7] -tempAlive1 = scalar, U08, 1108, "", 1, 0 -tempCode1 = scalar, U08, 1109, "", 1, 0 +acSwitchLastChangeTimeMs = scalar, S32, 1088, "", 1, 0 +; total TS size = 1092 +cranking0 = bits, U32, 1092, [0:0] +notRunning0 = bits, U32, 1092, [1:1] +disabledWhileEngineStopped0 = bits, U32, 1092, [2:2] +brokenClt0 = bits, U32, 1092, [3:3] +enabledForAc0 = bits, U32, 1092, [4:4] +hot0 = bits, U32, 1092, [5:5] +cold0 = bits, U32, 1092, [6:6] +disabledBySpeed0 = bits, U32, 1092, [7:7] +tempAlive0 = scalar, U08, 1096, "", 1, 0 +tempCode0 = scalar, U08, 1097, "", 1, 0 +; total TS size = 1100 +cranking1 = bits, U32, 1100, [0:0] +notRunning1 = bits, U32, 1100, [1:1] +disabledWhileEngineStopped1 = bits, U32, 1100, [2:2] +brokenClt1 = bits, U32, 1100, [3:3] +enabledForAc1 = bits, U32, 1100, [4:4] +hot1 = bits, U32, 1100, [5:5] +cold1 = bits, U32, 1100, [6:6] +disabledBySpeed1 = bits, U32, 1100, [7:7] +tempAlive1 = scalar, U08, 1104, "", 1, 0 +tempCode1 = scalar, U08, 1105, "", 1, 0 +; total TS size = 1108 +isPrime = bits, U32, 1108, [0:0] +engineTurnedRecently = bits, U32, 1108, [1:1] +isFuelPumpOn = bits, U32, 1108, [2:2] +ignitionOn = bits, U32, 1108, [3:3] ; total TS size = 1112 -isPrime = bits, U32, 1112, [0:0] -engineTurnedRecently = bits, U32, 1112, [1:1] -isFuelPumpOn = bits, U32, 1112, [2:2] -ignitionOn = bits, U32, 1112, [3:3] +isBenchTest = bits, U32, 1112, [0:0] +hasIgnitionVoltage = bits, U32, 1112, [1:1] +mainRelayState = bits, U32, 1112, [2:2] +delayedShutoffRequested = bits, U32, 1112, [3:3] ; total TS size = 1116 -isBenchTest = bits, U32, 1116, [0:0] -hasIgnitionVoltage = bits, U32, 1116, [1:1] -mainRelayState = bits, U32, 1116, [2:2] -delayedShutoffRequested = bits, U32, 1116, [3:3] -; total TS size = 1120 -lua_fuelAdd = scalar, F32, 1120, "g", 1, 0 -lua_fuelMult = scalar, F32, 1124, "", 1, 0 -lua_clutchUpState = bits, U32, 1128, [0:0] -lua_brakePedalState = bits, U32, 1128, [1:1] -lua_acRequestState = bits, U32, 1128, [2:2] -lua_luaDisableEtb = bits, U32, 1128, [3:3] -lua_luaIgnCut = bits, U32, 1128, [4:4] -lua_luaFuelCut = bits, U32, 1128, [5:5] -lua_clutchDownState = bits, U32, 1128, [6:6] -lua_disableDecelerationFuelCutOff = bits, U32, 1128, [7:7] -sd_tCharge = scalar, S16, 1132, "deg C", 0.01, 0 -sd_tChargeK = scalar, F32, 1136, "", 1, 0 -crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1140, "", 1, 0 -crankingFuel_tpsCoefficient = scalar, F32, 1144, "", 1, 0 -crankingFuel_durationCoefficient = scalar, F32, 1148, "", 1, 0 -crankingFuel_fuel = scalar, U16, 1152, "mg", 0.01, 0 -baroCorrection = scalar, F32, 1156, "", 1, 0 -hellenBoardId = scalar, S16, 1160, "id", 1, 0 -clutchUpState = scalar, S08, 1162, "", 1, 0 -clutchDownState = scalar, S08, 1163, "", 1, 0 -brakePedalState = scalar, S08, 1164, "", 1, 0 -startStopState = scalar, S08, 1165, "", 1, 0 -smartChipState = scalar, S08, 1166, "", 1, 0 -smartChipRestartCounter = scalar, S08, 1167, "", 1, 0 -smartChipAliveCounter = scalar, S08, 1168, "", 1, 0 -startStopPhysicalState = bits, U32, 1172, [0:0] -acrActive = bits, U32, 1172, [1:1] -acrEngineMovedRecently = bits, U32, 1172, [2:2] -heaterControlEnabled = bits, U32, 1172, [3:3] -luaDigitalState0 = bits, U32, 1172, [4:4] -luaDigitalState1 = bits, U32, 1172, [5:5] -luaDigitalState2 = bits, U32, 1172, [6:6] -luaDigitalState3 = bits, U32, 1172, [7:7] -startStopStateToggleCounter = scalar, U32, 1176, "", 1, 0 -luaSoftSparkSkip = scalar, F32, 1180, "", 1, 0 -luaHardSparkSkip = scalar, F32, 1184, "", 1, 0 -tractionControlSparkSkip = scalar, F32, 1188, "", 1, 0 -desiredRpmLimit = scalar, S16, 1192, "rpm", 1, 0 -fuelInjectionCounter = scalar, U32, 1196, "", 1, 0 -globalSparkCounter = scalar, U32, 1200, "", 1, 0 -fuelingLoad = scalar, F32, 1204, "", 1, 0 -ignitionLoad = scalar, F32, 1208, "", 1, 0 -veTableYAxis = scalar, U16, 1212, "%", 0.01, 0 -overDwellCounter = scalar, U08, 1214, "", 1, 0 -overDwellNotScheduledCounter = scalar, U08, 1215, "", 1, 0 -sparkOutOfOrderCounter = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -tpsFrom = scalar, F32, 1220 -tpsTo = scalar, F32, 1224 -deltaTps = scalar, F32, 1228 -extraFuel = scalar, F32, 1232, "", 1, 0 -valueFromTable = scalar, F32, 1236, "", 1, 0 -isAboveAccelThreshold = bits, U32, 1240, [0:0] -isBelowDecelThreshold = bits, U32, 1240, [1:1] -isTimeToResetAccumulator = bits, U32, 1240, [2:2] -isFractionalEnrichment = bits, U32, 1240, [3:3] -belowEpsilon = bits, U32, 1240, [4:4] -tooShort = bits, U32, 1240, [5:5] -fractionalInjFuel = scalar, F32, 1244, "", 1, 0 -accumulatedValue = scalar, F32, 1248, "", 1, 0 -maxExtraPerCycle = scalar, F32, 1252, "", 1, 0 -maxExtraPerPeriod = scalar, F32, 1256, "", 1, 0 -maxInjectedPerPeriod = scalar, F32, 1260, "", 1, 0 -cycleCnt = scalar, S32, 1264, "", 1, 0 -; total TS size = 1268 -hwEventCounters1 = scalar, U32, 1268, "", 1, 0 -hwEventCounters2 = scalar, U32, 1272, "", 1, 0 -hwEventCounters3 = scalar, U32, 1276, "", 1, 0 -hwEventCounters4 = scalar, U32, 1280, "", 1, 0 -hwEventCounters5 = scalar, U32, 1284, "", 1, 0 -hwEventCounters6 = scalar, U32, 1288, "", 1, 0 -vvtCamCounter = scalar, U32, 1292, "", 1, 0 -mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1296, "", 1, 0 -mapVvt_MAP_AT_DIFF = scalar, F32, 1300, "", 1, 0 -mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1304, "", 1, 0 -mapVvt_map_peak = scalar, U08, 1305, "", 1, 0 -currentEngineDecodedPhase = scalar, F32, 1308, "deg", 1, 0 -triggerToothAngleError = scalar, F32, 1312, "deg", 1, 0 -triggerIgnoredToothCount = scalar, U08, 1316, "", 1, 0 -mapCamPrevToothAngle = scalar, F32, 1320, "deg", 1, 0 -isDecodingMapCam = bits, U32, 1324, [0:0] -triggerElapsedUs = scalar, U32, 1328, "", 1, 0 -; total TS size = 1332 -crankSynchronizationCounter0 = scalar, U32, 1332, "", 1, 0 -vvtSyncGapRatio0 = scalar, F32, 1336, "", 1, 0 -vvtToothDurations00 = scalar, U32, 1340, "us", 1, 0 -vvtCurrentPosition0 = scalar, F32, 1344, "sync: Primary Cam Position", 1, 0 -vvtToothPosition10 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition20 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition30 = scalar, F32, 1356, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition40 = scalar, F32, 1360, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio0 = scalar, F32, 1364, "", 1, 0 -triggerStateIndex0 = scalar, U08, 1368, "", 1, 0 -vvtStateIndex0 = scalar, U08, 1369, "", 1, 0 -; total TS size = 1372 -crankSynchronizationCounter1 = scalar, U32, 1372, "", 1, 0 -vvtSyncGapRatio1 = scalar, F32, 1376, "", 1, 0 -vvtToothDurations01 = scalar, U32, 1380, "us", 1, 0 -vvtCurrentPosition1 = scalar, F32, 1384, "sync: Primary Cam Position", 1, 0 -vvtToothPosition11 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition21 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition31 = scalar, F32, 1396, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition41 = scalar, F32, 1400, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio1 = scalar, F32, 1404, "", 1, 0 -triggerStateIndex1 = scalar, U08, 1408, "", 1, 0 -vvtStateIndex1 = scalar, U08, 1409, "", 1, 0 -; total TS size = 1412 -crankSynchronizationCounter2 = scalar, U32, 1412, "", 1, 0 -vvtSyncGapRatio2 = scalar, F32, 1416, "", 1, 0 -vvtToothDurations02 = scalar, U32, 1420, "us", 1, 0 -vvtCurrentPosition2 = scalar, F32, 1424, "sync: Primary Cam Position", 1, 0 -vvtToothPosition12 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition22 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition32 = scalar, F32, 1436, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition42 = scalar, F32, 1440, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio2 = scalar, F32, 1444, "", 1, 0 -triggerStateIndex2 = scalar, U08, 1448, "", 1, 0 -vvtStateIndex2 = scalar, U08, 1449, "", 1, 0 -; total TS size = 1452 -crankSynchronizationCounter3 = scalar, U32, 1452, "", 1, 0 -vvtSyncGapRatio3 = scalar, F32, 1456, "", 1, 0 -vvtToothDurations03 = scalar, U32, 1460, "us", 1, 0 -vvtCurrentPosition3 = scalar, F32, 1464, "sync: Primary Cam Position", 1, 0 -vvtToothPosition13 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition23 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition33 = scalar, F32, 1476, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition43 = scalar, F32, 1480, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio3 = scalar, F32, 1484, "", 1, 0 -triggerStateIndex3 = scalar, U08, 1488, "", 1, 0 -vvtStateIndex3 = scalar, U08, 1489, "", 1, 0 -; total TS size = 1492 -crankSynchronizationCounter4 = scalar, U32, 1492, "", 1, 0 -vvtSyncGapRatio4 = scalar, F32, 1496, "", 1, 0 -vvtToothDurations04 = scalar, U32, 1500, "us", 1, 0 -vvtCurrentPosition4 = scalar, F32, 1504, "sync: Primary Cam Position", 1, 0 -vvtToothPosition14 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition24 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition34 = scalar, F32, 1516, "sync: Cam Tooth Position", 1, 0 -vvtToothPosition44 = scalar, F32, 1520, "sync: Cam Tooth Position", 1, 0 -triggerSyncGapRatio4 = scalar, F32, 1524, "", 1, 0 -triggerStateIndex4 = scalar, U08, 1528, "", 1, 0 -vvtStateIndex4 = scalar, U08, 1529, "", 1, 0 -; total TS size = 1532 -camResyncCounter = scalar, U08, 1532, "", 1, 0 -m_hasSynchronizedPhase = bits, U32, 1536, [0:0] -; total TS size = 1540 -wallFuelCorrection = scalar, F32, 1540, "", 1, 0 -wallFuel = scalar, F32, 1544, "", 1, 0 -; total TS size = 1548 -idleState = bits, S32, 1548, [0:2], "not important" -currentIdlePosition = scalar, F32, 1552 -baseIdlePosition = scalar, F32, 1556 -idleClosedLoop = scalar, F32, 1560 -iacByTpsTaper = scalar, F32, 1564 -throttlePedalUpState = scalar, S32, 1568, "", 1, 0 -mightResetPid = bits, U32, 1572, [0:0] -shouldResetPid = bits, U32, 1572, [1:1] -wasResetPid = bits, U32, 1572, [2:2] -mustResetPid = bits, U32, 1572, [3:3] -isCranking = bits, U32, 1572, [4:4] -isIacTableForCoasting = bits, U32, 1572, [5:5] -notIdling = bits, U32, 1572, [6:6] -needReset = bits, U32, 1572, [7:7] -isInDeadZone = bits, U32, 1572, [8:8] -isBlipping = bits, U32, 1572, [9:9] -useClosedLoop = bits, U32, 1572, [10:10] -badTps = bits, U32, 1572, [11:11] -looksLikeRunning = bits, U32, 1572, [12:12] -looksLikeCoasting = bits, U32, 1572, [13:13] -looksLikeCrankToIdle = bits, U32, 1572, [14:14] -isIdleCoasting = bits, U32, 1572, [15:15] -isIdleClosedLoop = bits, U32, 1572, [16:16] -idleTarget = scalar, S32, 1576, "", 1, 0 -targetRpmByClt = scalar, S32, 1580, "", 1, 0 -targetRpmAc = scalar, S32, 1584, "", 1, 0 -iacByRpmTaper = scalar, F32, 1588 -luaAdd = scalar, F32, 1592 -; total TS size = 1596 -targetWithIdlePosition0 = scalar, F32, 1596, "per", 1,0 -trim0 = scalar, F32, 1600, "", 1, 0 -luaAdjustment0 = scalar, F32, 1604, "per", 1,0 -m_wastegatePosition0 = scalar, F32, 1608, "per", 1,0 -etbFeedForward0 = scalar, F32, 1612 -etbIntegralError0 = scalar, F32, 1616, "", 1, 0 -etbCurrentTarget0 = scalar, F32, 1620, "%", 1, 0 -etbCurrentAdjustedTarget0 = scalar, F32, 1624, "%", 1, 0 -etbRevLimitActive0 = bits, U32, 1628, [0:0] -jamDetected0 = bits, U32, 1628, [1:1] -etbDutyRateOfChange0 = scalar, F32, 1632, "per", 1,0 -etbDutyAverage0 = scalar, F32, 1636, "per", 1,0 -etbTpsErrorCounter0 = scalar, U16, 1640, "count", 1,0 -etbPpsErrorCounter0 = scalar, U16, 1642, "count", 1,0 -etbErrorCode0 = scalar, S08, 1644, "", 1, 0 -tcEtbDrop0 = scalar, S08, 1645, "", 1, 0 -jamTimer0 = scalar, U16, 1646, "sec", 0.01, 0 -; total TS size = 1648 -targetWithIdlePosition1 = scalar, F32, 1648, "per", 1,0 -trim1 = scalar, F32, 1652, "", 1, 0 -luaAdjustment1 = scalar, F32, 1656, "per", 1,0 -m_wastegatePosition1 = scalar, F32, 1660, "per", 1,0 -etbFeedForward1 = scalar, F32, 1664 -etbIntegralError1 = scalar, F32, 1668, "", 1, 0 -etbCurrentTarget1 = scalar, F32, 1672, "%", 1, 0 -etbCurrentAdjustedTarget1 = scalar, F32, 1676, "%", 1, 0 -etbRevLimitActive1 = bits, U32, 1680, [0:0] -jamDetected1 = bits, U32, 1680, [1:1] -etbDutyRateOfChange1 = scalar, F32, 1684, "per", 1,0 -etbDutyAverage1 = scalar, F32, 1688, "per", 1,0 -etbTpsErrorCounter1 = scalar, U16, 1692, "count", 1,0 -etbPpsErrorCounter1 = scalar, U16, 1694, "count", 1,0 -etbErrorCode1 = scalar, S08, 1696, "", 1, 0 -tcEtbDrop1 = scalar, S08, 1697, "", 1, 0 -jamTimer1 = scalar, U16, 1698, "sec", 0.01, 0 -; total TS size = 1700 -faultCode0 = scalar, U08, 1700, "", 1, 0 -heaterDuty0 = scalar, U08, 1701, "%", 1, 0 -pumpDuty0 = scalar, U08, 1702, "%", 1, 0 -tempC0 = scalar, U16, 1704, "C", 1, 0 -nernstVoltage0 = scalar, U16, 1706, "V", 0.001, 0 -esr0 = scalar, U16, 1708, "ohm", 1, 0 -; total TS size = 1712 -faultCode1 = scalar, U08, 1712, "", 1, 0 -heaterDuty1 = scalar, U08, 1713, "%", 1, 0 -pumpDuty1 = scalar, U08, 1714, "%", 1, 0 -tempC1 = scalar, U16, 1716, "C", 1, 0 -nernstVoltage1 = scalar, U16, 1718, "V", 0.001, 0 -esr1 = scalar, U16, 1720, "ohm", 1, 0 -; total TS size = 1724 -dcOutput0 = scalar, F32, 1724, "per", 1,0 -isEnabled0_int = scalar, U08, 1728, "per", 1,0 -isEnabled0 = bits, U32, 1732, [0:0] -; total TS size = 1736 -value0 = scalar, U16, 1736, "value", 1,0 -value1 = scalar, U16, 1738, "value", 1,0 -errorRate = scalar, F32, 1740, "ratio", 1,0 +lua_fuelAdd = scalar, F32, 1116, "g", 1, 0 +lua_fuelMult = scalar, F32, 1120, "", 1, 0 +lua_clutchUpState = bits, U32, 1124, [0:0] +lua_brakePedalState = bits, U32, 1124, [1:1] +lua_acRequestState = bits, U32, 1124, [2:2] +lua_luaDisableEtb = bits, U32, 1124, [3:3] +lua_luaIgnCut = bits, U32, 1124, [4:4] +lua_luaFuelCut = bits, U32, 1124, [5:5] +lua_clutchDownState = bits, U32, 1124, [6:6] +lua_disableDecelerationFuelCutOff = bits, U32, 1124, [7:7] +sd_tCharge = scalar, S16, 1128, "deg C", 0.01, 0 +sd_tChargeK = scalar, F32, 1132, "", 1, 0 +crankingFuel_coolantTemperatureCoefficient = scalar, F32, 1136, "", 1, 0 +crankingFuel_tpsCoefficient = scalar, F32, 1140, "", 1, 0 +crankingFuel_durationCoefficient = scalar, F32, 1144, "", 1, 0 +crankingFuel_fuel = scalar, U16, 1148, "mg", 0.01, 0 +baroCorrection = scalar, F32, 1152, "", 1, 0 +hellenBoardId = scalar, S16, 1156, "id", 1, 0 +clutchUpState = scalar, S08, 1158, "", 1, 0 +clutchDownState = scalar, S08, 1159, "", 1, 0 +brakePedalState = scalar, S08, 1160, "", 1, 0 +startStopState = scalar, S08, 1161, "", 1, 0 +smartChipState = scalar, S08, 1162, "", 1, 0 +smartChipRestartCounter = scalar, S08, 1163, "", 1, 0 +smartChipAliveCounter = scalar, S08, 1164, "", 1, 0 +startStopPhysicalState = bits, U32, 1168, [0:0] +acrActive = bits, U32, 1168, [1:1] +acrEngineMovedRecently = bits, U32, 1168, [2:2] +heaterControlEnabled = bits, U32, 1168, [3:3] +luaDigitalState0 = bits, U32, 1168, [4:4] +luaDigitalState1 = bits, U32, 1168, [5:5] +luaDigitalState2 = bits, U32, 1168, [6:6] +luaDigitalState3 = bits, U32, 1168, [7:7] +startStopStateToggleCounter = scalar, U32, 1172, "", 1, 0 +luaSoftSparkSkip = scalar, F32, 1176, "", 1, 0 +luaHardSparkSkip = scalar, F32, 1180, "", 1, 0 +tractionControlSparkSkip = scalar, F32, 1184, "", 1, 0 +desiredRpmLimit = scalar, S16, 1188, "rpm", 1, 0 +fuelInjectionCounter = scalar, U32, 1192, "", 1, 0 +globalSparkCounter = scalar, U32, 1196, "", 1, 0 +fuelingLoad = scalar, F32, 1200, "", 1, 0 +ignitionLoad = scalar, F32, 1204, "", 1, 0 +veTableYAxis = scalar, U16, 1208, "%", 0.01, 0 +overDwellCounter = scalar, U08, 1210, "", 1, 0 +overDwellNotScheduledCounter = scalar, U08, 1211, "", 1, 0 +sparkOutOfOrderCounter = scalar, U08, 1212, "", 1, 0 +; total TS size = 1216 +tpsFrom = scalar, F32, 1216 +tpsTo = scalar, F32, 1220 +deltaTps = scalar, F32, 1224 +extraFuel = scalar, F32, 1228, "", 1, 0 +valueFromTable = scalar, F32, 1232, "", 1, 0 +isAboveAccelThreshold = bits, U32, 1236, [0:0] +isBelowDecelThreshold = bits, U32, 1236, [1:1] +isTimeToResetAccumulator = bits, U32, 1236, [2:2] +isFractionalEnrichment = bits, U32, 1236, [3:3] +belowEpsilon = bits, U32, 1236, [4:4] +tooShort = bits, U32, 1236, [5:5] +fractionalInjFuel = scalar, F32, 1240, "", 1, 0 +accumulatedValue = scalar, F32, 1244, "", 1, 0 +maxExtraPerCycle = scalar, F32, 1248, "", 1, 0 +maxExtraPerPeriod = scalar, F32, 1252, "", 1, 0 +maxInjectedPerPeriod = scalar, F32, 1256, "", 1, 0 +cycleCnt = scalar, S32, 1260, "", 1, 0 +; total TS size = 1264 +hwEventCounters1 = scalar, U32, 1264, "", 1, 0 +hwEventCounters2 = scalar, U32, 1268, "", 1, 0 +hwEventCounters3 = scalar, U32, 1272, "", 1, 0 +hwEventCounters4 = scalar, U32, 1276, "", 1, 0 +hwEventCounters5 = scalar, U32, 1280, "", 1, 0 +hwEventCounters6 = scalar, U32, 1284, "", 1, 0 +vvtCamCounter = scalar, U32, 1288, "", 1, 0 +mapVvt_MAP_AT_SPECIAL_POINT = scalar, F32, 1292, "", 1, 0 +mapVvt_MAP_AT_DIFF = scalar, F32, 1296, "", 1, 0 +mapVvt_MAP_AT_CYCLE_COUNT = scalar, U08, 1300, "", 1, 0 +mapVvt_map_peak = scalar, U08, 1301, "", 1, 0 +currentEngineDecodedPhase = scalar, F32, 1304, "deg", 1, 0 +triggerToothAngleError = scalar, F32, 1308, "deg", 1, 0 +triggerIgnoredToothCount = scalar, U08, 1312, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1316, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1320, [0:0] +triggerElapsedUs = scalar, U32, 1324, "", 1, 0 +; total TS size = 1328 +crankSynchronizationCounter0 = scalar, U32, 1328, "", 1, 0 +vvtSyncGapRatio0 = scalar, F32, 1332, "", 1, 0 +vvtToothDurations00 = scalar, U32, 1336, "us", 1, 0 +vvtCurrentPosition0 = scalar, F32, 1340, "sync: Primary Cam Position", 1, 0 +vvtToothPosition10 = scalar, F32, 1344, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition20 = scalar, F32, 1348, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition30 = scalar, F32, 1352, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition40 = scalar, F32, 1356, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio0 = scalar, F32, 1360, "", 1, 0 +triggerStateIndex0 = scalar, U08, 1364, "", 1, 0 +vvtStateIndex0 = scalar, U08, 1365, "", 1, 0 +; total TS size = 1368 +crankSynchronizationCounter1 = scalar, U32, 1368, "", 1, 0 +vvtSyncGapRatio1 = scalar, F32, 1372, "", 1, 0 +vvtToothDurations01 = scalar, U32, 1376, "us", 1, 0 +vvtCurrentPosition1 = scalar, F32, 1380, "sync: Primary Cam Position", 1, 0 +vvtToothPosition11 = scalar, F32, 1384, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition21 = scalar, F32, 1388, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition31 = scalar, F32, 1392, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition41 = scalar, F32, 1396, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio1 = scalar, F32, 1400, "", 1, 0 +triggerStateIndex1 = scalar, U08, 1404, "", 1, 0 +vvtStateIndex1 = scalar, U08, 1405, "", 1, 0 +; total TS size = 1408 +crankSynchronizationCounter2 = scalar, U32, 1408, "", 1, 0 +vvtSyncGapRatio2 = scalar, F32, 1412, "", 1, 0 +vvtToothDurations02 = scalar, U32, 1416, "us", 1, 0 +vvtCurrentPosition2 = scalar, F32, 1420, "sync: Primary Cam Position", 1, 0 +vvtToothPosition12 = scalar, F32, 1424, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition22 = scalar, F32, 1428, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition32 = scalar, F32, 1432, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition42 = scalar, F32, 1436, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio2 = scalar, F32, 1440, "", 1, 0 +triggerStateIndex2 = scalar, U08, 1444, "", 1, 0 +vvtStateIndex2 = scalar, U08, 1445, "", 1, 0 +; total TS size = 1448 +crankSynchronizationCounter3 = scalar, U32, 1448, "", 1, 0 +vvtSyncGapRatio3 = scalar, F32, 1452, "", 1, 0 +vvtToothDurations03 = scalar, U32, 1456, "us", 1, 0 +vvtCurrentPosition3 = scalar, F32, 1460, "sync: Primary Cam Position", 1, 0 +vvtToothPosition13 = scalar, F32, 1464, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition23 = scalar, F32, 1468, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition33 = scalar, F32, 1472, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition43 = scalar, F32, 1476, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio3 = scalar, F32, 1480, "", 1, 0 +triggerStateIndex3 = scalar, U08, 1484, "", 1, 0 +vvtStateIndex3 = scalar, U08, 1485, "", 1, 0 +; total TS size = 1488 +crankSynchronizationCounter4 = scalar, U32, 1488, "", 1, 0 +vvtSyncGapRatio4 = scalar, F32, 1492, "", 1, 0 +vvtToothDurations04 = scalar, U32, 1496, "us", 1, 0 +vvtCurrentPosition4 = scalar, F32, 1500, "sync: Primary Cam Position", 1, 0 +vvtToothPosition14 = scalar, F32, 1504, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition24 = scalar, F32, 1508, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition34 = scalar, F32, 1512, "sync: Cam Tooth Position", 1, 0 +vvtToothPosition44 = scalar, F32, 1516, "sync: Cam Tooth Position", 1, 0 +triggerSyncGapRatio4 = scalar, F32, 1520, "", 1, 0 +triggerStateIndex4 = scalar, U08, 1524, "", 1, 0 +vvtStateIndex4 = scalar, U08, 1525, "", 1, 0 +; total TS size = 1528 +camResyncCounter = scalar, U08, 1528, "", 1, 0 +m_hasSynchronizedPhase = bits, U32, 1532, [0:0] +; total TS size = 1536 +wallFuelCorrection = scalar, F32, 1536, "", 1, 0 +wallFuel = scalar, F32, 1540, "", 1, 0 +; total TS size = 1544 +idleState = bits, S32, 1544, [0:2], "not important" +currentIdlePosition = scalar, F32, 1548 +baseIdlePosition = scalar, F32, 1552 +idleClosedLoop = scalar, F32, 1556 +iacByTpsTaper = scalar, F32, 1560 +throttlePedalUpState = scalar, S32, 1564, "", 1, 0 +mightResetPid = bits, U32, 1568, [0:0] +shouldResetPid = bits, U32, 1568, [1:1] +wasResetPid = bits, U32, 1568, [2:2] +mustResetPid = bits, U32, 1568, [3:3] +isCranking = bits, U32, 1568, [4:4] +isIacTableForCoasting = bits, U32, 1568, [5:5] +notIdling = bits, U32, 1568, [6:6] +needReset = bits, U32, 1568, [7:7] +isInDeadZone = bits, U32, 1568, [8:8] +isBlipping = bits, U32, 1568, [9:9] +useClosedLoop = bits, U32, 1568, [10:10] +badTps = bits, U32, 1568, [11:11] +looksLikeRunning = bits, U32, 1568, [12:12] +looksLikeCoasting = bits, U32, 1568, [13:13] +looksLikeCrankToIdle = bits, U32, 1568, [14:14] +isIdleCoasting = bits, U32, 1568, [15:15] +isIdleClosedLoop = bits, U32, 1568, [16:16] +idleTarget = scalar, S32, 1572, "", 1, 0 +targetRpmByClt = scalar, S32, 1576, "", 1, 0 +targetRpmAc = scalar, S32, 1580, "", 1, 0 +iacByRpmTaper = scalar, F32, 1584 +luaAdd = scalar, F32, 1588 +; total TS size = 1592 +targetWithIdlePosition0 = scalar, F32, 1592, "per", 1,0 +trim0 = scalar, F32, 1596, "", 1, 0 +luaAdjustment0 = scalar, F32, 1600, "per", 1,0 +m_wastegatePosition0 = scalar, F32, 1604, "per", 1,0 +etbFeedForward0 = scalar, F32, 1608 +etbIntegralError0 = scalar, F32, 1612, "", 1, 0 +etbCurrentTarget0 = scalar, F32, 1616, "%", 1, 0 +etbCurrentAdjustedTarget0 = scalar, F32, 1620, "%", 1, 0 +etbRevLimitActive0 = bits, U32, 1624, [0:0] +jamDetected0 = bits, U32, 1624, [1:1] +etbDutyRateOfChange0 = scalar, F32, 1628, "per", 1,0 +etbDutyAverage0 = scalar, F32, 1632, "per", 1,0 +etbTpsErrorCounter0 = scalar, U16, 1636, "count", 1,0 +etbPpsErrorCounter0 = scalar, U16, 1638, "count", 1,0 +etbErrorCode0 = scalar, S08, 1640, "", 1, 0 +tcEtbDrop0 = scalar, S08, 1641, "", 1, 0 +jamTimer0 = scalar, U16, 1642, "sec", 0.01, 0 +; total TS size = 1644 +targetWithIdlePosition1 = scalar, F32, 1644, "per", 1,0 +trim1 = scalar, F32, 1648, "", 1, 0 +luaAdjustment1 = scalar, F32, 1652, "per", 1,0 +m_wastegatePosition1 = scalar, F32, 1656, "per", 1,0 +etbFeedForward1 = scalar, F32, 1660 +etbIntegralError1 = scalar, F32, 1664, "", 1, 0 +etbCurrentTarget1 = scalar, F32, 1668, "%", 1, 0 +etbCurrentAdjustedTarget1 = scalar, F32, 1672, "%", 1, 0 +etbRevLimitActive1 = bits, U32, 1676, [0:0] +jamDetected1 = bits, U32, 1676, [1:1] +etbDutyRateOfChange1 = scalar, F32, 1680, "per", 1,0 +etbDutyAverage1 = scalar, F32, 1684, "per", 1,0 +etbTpsErrorCounter1 = scalar, U16, 1688, "count", 1,0 +etbPpsErrorCounter1 = scalar, U16, 1690, "count", 1,0 +etbErrorCode1 = scalar, S08, 1692, "", 1, 0 +tcEtbDrop1 = scalar, S08, 1693, "", 1, 0 +jamTimer1 = scalar, U16, 1694, "sec", 0.01, 0 +; total TS size = 1696 +faultCode0 = scalar, U08, 1696, "", 1, 0 +heaterDuty0 = scalar, U08, 1697, "%", 1, 0 +pumpDuty0 = scalar, U08, 1698, "%", 1, 0 +tempC0 = scalar, U16, 1700, "C", 1, 0 +nernstVoltage0 = scalar, U16, 1702, "V", 0.001, 0 +esr0 = scalar, U16, 1704, "ohm", 1, 0 +; total TS size = 1708 +faultCode1 = scalar, U08, 1708, "", 1, 0 +heaterDuty1 = scalar, U08, 1709, "%", 1, 0 +pumpDuty1 = scalar, U08, 1710, "%", 1, 0 +tempC1 = scalar, U16, 1712, "C", 1, 0 +nernstVoltage1 = scalar, U16, 1714, "V", 0.001, 0 +esr1 = scalar, U16, 1716, "ohm", 1, 0 +; total TS size = 1720 +dcOutput0 = scalar, F32, 1720, "per", 1,0 +isEnabled0_int = scalar, U08, 1724, "per", 1,0 +isEnabled0 = bits, U32, 1728, [0:0] +; total TS size = 1732 +value0 = scalar, U16, 1732, "value", 1,0 +value1 = scalar, U16, 1734, "value", 1,0 +errorRate = scalar, F32, 1736, "ratio", 1,0 +; total TS size = 1740 +vvtTarget = scalar, U16, 1740, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1742, "%", 0.5, 0 ; total TS size = 1744 -vvtTarget = scalar, U16, 1744, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1746, "%", 0.5, 0 -; total TS size = 1748 -lambdaCurrentlyGood = bits, U32, 1748, [0:0] -lambdaMonitorCut = bits, U32, 1748, [1:1] -lambdaTimeSinceGood = scalar, U16, 1752, "sec", 0.01, 0 -; total TS size = 1756 +lambdaCurrentlyGood = bits, U32, 1744, [0:0] +lambdaMonitorCut = bits, U32, 1744, [1:1] +lambdaTimeSinceGood = scalar, U16, 1748, "sec", 0.01, 0 +; total TS size = 1752 time = { timeNow } @@ -5681,7 +5680,6 @@ entry = isDisabledByLua, "AC disabled by Lua", int, "%d" entry = acCompressorState, "AC compressor on", int, "%d" entry = acPressureTooLow, "AC pressure too low", int, "%d" entry = acPressureTooHigh, "AC pressure too high", int, "%d" -entry = latest_usage_ac_control, "AC latest activity", int, "%d" entry = acSwitchLastChangeTimeMs, "acSwitchLastChangeTimeMs", int, "%d" entry = cranking0, "cranking0", int, "%d" entry = notRunning0, "notRunning0", int, "%d" @@ -6392,16 +6390,12 @@ cmd_test_vvt1_valve = "Z\x00\x16\x00\x11" cmd_test_vvt2_valve = "Z\x00\x16\x00\x12" cmd_test_vvt3_valve = "Z\x00\x16\x00\x13" -cmd_calibrate_tps_1_closed = "Z\x00\x14\x00\x02" -cmd_calibrate_tps_1_wot = "Z\x00\x14\x00\x03" -cmd_calibrate_tps_2_closed = "Z\x00\x14\x00\x04" -cmd_calibrate_tps_2_wot = "Z\x00\x14\x00\x05" cmd_calibrate_pedal_up = "Z\x00\x14\x00\x06" cmd_calibrate_pedal_down = "Z\x00\x14\x00\x07" cmd_tle8888_init = "Z\x00\x14\x00\x08" cmd_mc33810_init = "Z\x00\x14\x00\x14" cmd_write_config = "Z\x00\x14\x00\x0a" -cmd_etb_reset = "Z\x00\x14\x00\x0b" +;cmd_etb_reset = "Z\x00\x14\x00\x0b" cmd_etb_autotune = "Z\x00\x14\x00\x0C" cmd_enable_self_stim = "Z\x00\x14\x00\x0D" cmd_etb_auto_calibrate = "Z\x00\x14\x00\x0E" @@ -6679,7 +6673,6 @@ dialog = ac_controlDialog, "ac_control" panel = ac_controlIndicatorPanel liveGraph = ac_control_1_Graph, "Graph", South graphLine = acButtonState - graphLine = latest_usage_ac_control graphLine = acSwitchLastChangeTimeMs indicatorPanel = fan_control0IndicatorPanel, 2 @@ -9379,7 +9372,7 @@ dialog = tcuControls, "Transmission Settings" dialog = etbDialogRight panel = etbIdleDialog,{ etbFunctions1 == 1 || etbFunctions1 == 2 || etbFunctions2 == 1 || etbFunctions2 == 2 } - commandButton = "Reset ETB", cmd_etb_reset +; commandButton = "Reset ETB", cmd_etb_reset panel = etbPidDialog, { etbFunctions1 == 1 || etbFunctions1 == 2 || etbFunctions2 == 1 || etbFunctions2 == 2 } panel = etbAutotune, { etbFunctions1 == 1 || etbFunctions1 == 2 || etbFunctions2 == 1 || etbFunctions2 == 2 }