diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index 38dc7afc85..75ebb447fd 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1086,7 +1086,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 578464318 +#define SIGNATURE_HASH 2480964326 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1378,12 +1378,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.08.09.cypress.578464318" +#define TS_SIGNATURE "rusEFI master.2023.08.09.cypress.2480964326" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #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/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 7924fb733a..ec1f917690 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1086,7 +1086,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 1252854002 +#define SIGNATURE_HASH 4214693930 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1378,12 +1378,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.08.09.kin.1252854002" +#define TS_SIGNATURE "rusEFI master.2023.08.09.kin.4214693930" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #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/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 3f1e1e61eb..b9fb90ca75 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1033,7 +1033,7 @@ #define show_Frankenso_presets false #define show_Proteus_presets false #define show_test_presets false -#define SIGNATURE_HASH 636972329 +#define SIGNATURE_HASH 2490189297 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1325,12 +1325,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.08.09.subaru_eg33_f7.636972329" +#define TS_SIGNATURE "rusEFI master.2023.08.09.subaru_eg33_f7.2490189297" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #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/firmware/console/binary/generated/data_logs.ini b/firmware/console/binary/generated/data_logs.ini index 64c4e003f7..c31881f7a0 100644 --- a/firmware/console/binary/generated/data_logs.ini +++ b/firmware/console/binary/generated/data_logs.ini @@ -509,6 +509,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" diff --git a/firmware/console/binary/generated/fancy_content.ini b/firmware/console/binary/generated/fancy_content.ini index b159c29321..7d08894133 100644 --- a/firmware/console/binary/generated/fancy_content.ini +++ b/firmware/console/binary/generated/fancy_content.ini @@ -250,8 +250,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -270,6 +273,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/console/binary/generated/live_data_ids.h b/firmware/console/binary/generated/live_data_ids.h index bf4d0c25bc..71d804b5ab 100644 --- a/firmware/console/binary/generated/live_data_ids.h +++ b/firmware/console/binary/generated/live_data_ids.h @@ -47,13 +47,13 @@ LDS_lambda_monitor, #define ENGINE_STATE_BASE_ADDRESS 1036 #define TPS_ACCEL_STATE_BASE_ADDRESS 1120 #define TRIGGER_CENTRAL_BASE_ADDRESS 1168 -#define TRIGGER_STATE_BASE_ADDRESS 1220 -#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1244 -#define WALL_FUEL_STATE_BASE_ADDRESS 1248 -#define IDLE_STATE_BASE_ADDRESS 1256 -#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1296 -#define WIDEBAND_STATE_BASE_ADDRESS 1348 -#define DC_MOTORS_BASE_ADDRESS 1360 -#define SENT_STATE_BASE_ADDRESS 1372 -#define VVT_BASE_ADDRESS 1380 -#define LAMBDA_MONITOR_BASE_ADDRESS 1384 +#define TRIGGER_STATE_BASE_ADDRESS 1228 +#define TRIGGER_STATE_PRIMARY_BASE_ADDRESS 1252 +#define WALL_FUEL_STATE_BASE_ADDRESS 1256 +#define IDLE_STATE_BASE_ADDRESS 1264 +#define ELECTRONIC_THROTTLE_BASE_ADDRESS 1304 +#define WIDEBAND_STATE_BASE_ADDRESS 1356 +#define DC_MOTORS_BASE_ADDRESS 1368 +#define SENT_STATE_BASE_ADDRESS 1380 +#define VVT_BASE_ADDRESS 1388 +#define LAMBDA_MONITOR_BASE_ADDRESS 1392 diff --git a/firmware/console/binary/generated/output_channels.ini b/firmware/console/binary/generated/output_channels.ini index 42fa38e4ce..9884024f2c 100644 --- a/firmware/console/binary/generated/output_channels.ini +++ b/firmware/console/binary/generated/output_channels.ini @@ -685,85 +685,87 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 diff --git a/firmware/console/binary/generated/sensors.java b/firmware/console/binary/generated/sensors.java index 9a3e6e007f..02658cbf6b 100644 --- a/firmware/console/binary/generated/sensors.java +++ b/firmware/console/binary/generated/sensors.java @@ -497,57 +497,58 @@ currentEngineDecodedPhase("Sync: Engine Phase", SensorCategory.SENSOR_INPUTS, Fi triggerToothAngleError("Sync: trigger angle error", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1212, 1.0, -30.0, 30.0, "deg"), triggerIgnoredToothCount("triggerIgnoredToothCount", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1216, 1.0, -1.0, -1.0, ""), alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1217, 1.0, -20.0, 100.0, "units"), -crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -1.0, -1.0, ""), -vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1224, 1.0, -10000.0, 10000.0, ""), -vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, 0.0, 100000.0, "us"), -vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -10000.0, 10000.0, ""), -triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, -10000.0, 10000.0, ""), -triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1240, 1.0, -1.0, -1.0, ""), -vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1241, 1.0, -1.0, -1.0, ""), -camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1242, 1.0, -1.0, -1.0, ""), -vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1243, 1.0, -1.0, -1.0, ""), -wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1248, 1.0, -1.0, -1.0, ""), -wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1252, 1.0, -1.0, -1.0, ""), -idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1256, 1.0, -1.0, -1.0, ""), -currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -1.0, -1.0, ""), -baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1264, 1.0, -1.0, -1.0, ""), -iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1268, 1.0, -1.0, -1.0, ""), -throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -1.0, -1.0, ""), -targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1280, 1.0, -1.0, -1.0, ""), -targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1284, 1.0, -1.0, -1.0, ""), -iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 1.0, -1.0, -1.0, ""), -luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), -idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, 0.0, 10.0, "per"), -trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), -luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, 0.0, 3.0, "per"), -m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, 0.0, 3.0, "per"), -etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, -1.0, -1.0, ""), -etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, -10000.0, 10000.0, ""), -etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -10000.0, 10000.0, "%"), -etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, "%"), -etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, 0.0, 25.0, "per"), -etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1336, 1.0, -20.0, 50.0, "per"), -etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1340, 1.0, 0.0, 3.0, "count"), -etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1342, 1.0, 0.0, 3.0, "count"), -etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1344, 1.0, -1.0, -1.0, ""), -alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1345, 1.0, -20.0, 100.0, "units"), -jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1346, 0.01, 0.0, 100.0, "sec"), -faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1348, 1.0, -1.0, -1.0, ""), -heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1349, 1.0, 0.0, 100.0, "%"), -pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1350, 1.0, 0.0, 100.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1351, 1.0, -20.0, 100.0, "units"), -tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1352, 1.0, 500.0, 1000.0, "C"), -nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1354, 0.001, 0.0, 1.0, "V"), -esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1356, 1.0, 0.0, 10000.0, "ohm"), -alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, -20.0, 100.0, "units"), -dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1360, 1.0, 0.0, 10.0, "per"), -isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1364, 1.0, 0.0, 10.0, "per"), -alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1365, 1.0, -20.0, 100.0, "units"), -value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1372, 1.0, 0.0, 3.0, "value"), -value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1374, 1.0, 0.0, 3.0, "value"), -errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1376, 1.0, 0.0, 3.0, "ratio"), -vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1380, 0.1, -90.0, 90.0, "deg"), -vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1382, 0.5, 100.0, 1.0, "%"), -alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1383, 1.0, -20.0, 100.0, "units"), -lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 0.01, 0.0, 1.0, "sec"), -alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1390, 1.0, -20.0, 100.0, "units"), +mapCamPrevToothAngle("Sync: MAP: prev angle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1220, 1.0, -3000.0, 3000.0, "deg"), +crankSynchronizationCounter("sync: Crank sync counter\nUsually matches crank revolutions", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1228, 1.0, -1.0, -1.0, ""), +vvtSyncGapRatio("vvtSyncGapRatio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1232, 1.0, -10000.0, 10000.0, ""), +vvtToothDurations0("vvtToothDurations0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1236, 1.0, 0.0, 100000.0, "us"), +vvtCurrentPosition("vvtCurrentPosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1240, 1.0, -10000.0, 10000.0, ""), +triggerSyncGapRatio("Trigger Sync Latest Ratio", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1244, 1.0, -10000.0, 10000.0, ""), +triggerStateIndex("triggerStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1248, 1.0, -1.0, -1.0, ""), +vvtCounter("vvtCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1249, 1.0, -1.0, -1.0, ""), +camResyncCounter("camResyncCounter", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1250, 1.0, -1.0, -1.0, ""), +vvtStateIndex("vvtStateIndex", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1251, 1.0, -1.0, -1.0, ""), +wallFuelCorrection("fuel wallwetting injection time\n correction to account for wall wetting effect for current cycle", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1256, 1.0, -1.0, -1.0, ""), +wallFuel("Fuel on the wall\nin ms of injector open time for each injector.", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1260, 1.0, -1.0, -1.0, ""), +idleState("idleState", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1264, 1.0, -1.0, -1.0, ""), +currentIdlePosition("idle: current position\nthat's current position with CLT and IAT corrections", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1268, 1.0, -1.0, -1.0, ""), +baseIdlePosition("idle: base value\ncurrent position without adjustments (iacByTpsTaper, afterCrankingIACtaperDuration)", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1272, 1.0, -1.0, -1.0, ""), +iacByTpsTaper("idle: iacByTpsTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1276, 1.0, -1.0, -1.0, ""), +throttlePedalUpState("idle: throttlePedalUpState\ntrue in IDLE throttle pedal state, false if driver is touching the pedal\ntodo: better name for this field?", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1280, 1.0, -1.0, -1.0, ""), +targetRpmByClt("idle: target by CLT", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1288, 1.0, -1.0, -1.0, ""), +targetRpmAcBump("idle: A/C bump", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1292, 1.0, -1.0, -1.0, ""), +iacByRpmTaper("idle: iacByRpmTaper portion", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1296, 1.0, -1.0, -1.0, ""), +luaAdd("idle: Lua Adder", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1300, 1.0, -1.0, -1.0, ""), +idlePosition("ETB: idlePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1304, 1.0, 0.0, 10.0, "per"), +trim("ETB: trim", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1308, 1.0, -1.0, -1.0, ""), +luaAdjustment("ETB: luaAdjustment", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1312, 1.0, 0.0, 3.0, "per"), +m_wastegatePosition("DC: wastegatePosition", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1316, 1.0, 0.0, 3.0, "per"), +etbFeedForward("etbFeedForward", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1320, 1.0, -1.0, -1.0, ""), +etbIntegralError("etbIntegralError", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1324, 1.0, -10000.0, 10000.0, ""), +etbCurrentTarget("etbCurrentTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1328, 1.0, -10000.0, 10000.0, "%"), +etbCurrentAdjustedTarget("etbCurrentAdjustedTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1332, 1.0, -10000.0, 10000.0, "%"), +etbDutyRateOfChange("ETB duty rate of change", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1340, 1.0, 0.0, 25.0, "per"), +etbDutyAverage("ETB average duty", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1344, 1.0, -20.0, 50.0, "per"), +etbTpsErrorCounter("ETB TPS error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1348, 1.0, 0.0, 3.0, "count"), +etbPpsErrorCounter("ETB pedal error counter", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1350, 1.0, 0.0, 3.0, "count"), +etbErrorCode("etbErrorCode", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1352, 1.0, -1.0, -1.0, ""), +alignmentFill_at_49("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1353, 1.0, -20.0, 100.0, "units"), +jamTimer("ETB jam timer", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1354, 0.01, 0.0, 100.0, "sec"), +faultCode("WBO: Fault code", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1356, 1.0, -1.0, -1.0, ""), +heaterDuty("WBO: Heater duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1357, 1.0, 0.0, 100.0, "%"), +pumpDuty("WBO: Pump duty", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1358, 1.0, 0.0, 100.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1359, 1.0, -20.0, 100.0, "units"), +tempC("WBO: Temperature", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1360, 1.0, 500.0, 1000.0, "C"), +nernstVoltage("WBO: Nernst Voltage", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1362, 0.001, 0.0, 1.0, "V"), +esr("WBO: ESR", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1364, 1.0, 0.0, 10000.0, "ohm"), +alignmentFill_at_10("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1366, 1.0, -20.0, 100.0, "units"), +dcOutput0("DC: output0", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1368, 1.0, 0.0, 10.0, "per"), +isEnabled0_int("DC: en0", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1372, 1.0, 0.0, 10.0, "per"), +alignmentFill_at_5("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1373, 1.0, -20.0, 100.0, "units"), +value0("ETB: SENT value0", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1380, 1.0, 0.0, 3.0, "value"), +value1("ETB: SENT value1", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1382, 1.0, 0.0, 3.0, "value"), +errorRate("ETB: SENT error rate", SensorCategory.SENSOR_INPUTS, FieldType.INT, 1384, 1.0, 0.0, 3.0, "ratio"), +vvtTarget("vvtTarget", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1388, 0.1, -90.0, 90.0, "deg"), +vvtOutput("vvtOutput", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1390, 0.5, 100.0, 1.0, "%"), +alignmentFill_at_3("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1391, 1.0, -20.0, 100.0, "units"), +lambdaTimeSinceGood("lambdaTimeSinceGood", SensorCategory.SENSOR_INPUTS, FieldType.INT16, 1396, 0.01, 0.0, 1.0, "sec"), +alignmentFill_at_6("need 4 byte alignment", SensorCategory.SENSOR_INPUTS, FieldType.INT8, 1398, 1.0, -20.0, 100.0, "units"), diff --git a/firmware/console/binary/generated/total_live_data_generated.h b/firmware/console/binary/generated/total_live_data_generated.h index a7a0810a63..7e021143fb 100644 --- a/firmware/console/binary/generated/total_live_data_generated.h +++ b/firmware/console/binary/generated/total_live_data_generated.h @@ -1,2 +1,2 @@ // generated by gen_live_documentation.sh / LiveDataProcessor.java -#define TS_TOTAL_OUTPUT_SIZE 1392 \ No newline at end of file +#define TS_TOTAL_OUTPUT_SIZE 1400 \ No newline at end of file diff --git a/firmware/console/binary_log/log_fields_generated.h b/firmware/console/binary_log/log_fields_generated.h index 5554290837..b486be7019 100644 --- a/firmware/console/binary_log/log_fields_generated.h +++ b/firmware/console/binary_log/log_fields_generated.h @@ -414,6 +414,9 @@ static constexpr LogField fields[] = { #endif #if EFI_SHAFT_POSITION_INPUT {engine->triggerCentral.triggerIgnoredToothCount, "triggerIgnoredToothCount", "", 0}, +#endif +#if EFI_SHAFT_POSITION_INPUT + {engine->triggerCentral.mapCamPrevToothAngle, "Sync: MAP: prev angle", "deg", 2}, #endif {engine->dc_motors.dcOutput0, "DC: output0", "per", 2, "ETB more"}, {engine->dc_motors.isEnabled0_int, "DC: en0", "per", 2, "ETB more"}, diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 095cd04dc0..a66e0f9147 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1086,7 +1086,7 @@ #define SentEtbType_NONE 0 #define show_Frankenso_presets true #define show_test_presets true -#define SIGNATURE_HASH 2170697733 +#define SIGNATURE_HASH 821563613 #define SIMULATOR_TUNE_BIN_FILE_NAME "generated/simulator_tune_image.bin" #define spi_device_e_auto_enum 0="SPI_NONE",1="SPI_DEVICE_1",2="SPI_DEVICE_2",3="SPI_DEVICE_3",4="SPI_DEVICE_4" #define spi_device_e_SPI_DEVICE_1 1 @@ -1378,12 +1378,12 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI master.2023.08.09.f407-discovery.2170697733" +#define TS_SIGNATURE "rusEFI master.2023.08.09.f407-discovery.821563613" #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 1392 +#define TS_TOTAL_OUTPUT_SIZE 1400 #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/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index 79a9fe1301..f074a9d2dc 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1721770628 -#define TS_SIGNATURE "rusEFI master.2023.08.09.48way.1721770628" +#define SIGNATURE_HASH 3610905180 +#define TS_SIGNATURE "rusEFI master.2023.08.09.48way.3610905180" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index d01ef39035..9220f28da6 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1525401147 -#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-2chan.1525401147" +#define SIGNATURE_HASH 3950112483 +#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-2chan.3950112483" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 5d1df452a1..5b1c0dab28 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2615559474 -#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-4chan.2615559474" +#define SIGNATURE_HASH 712797674 +#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-4chan.712797674" diff --git a/firmware/controllers/generated/signature_alphax-4chan_f7.h b/firmware/controllers/generated/signature_alphax-4chan_f7.h index 9f4791eee8..fd4ca4b41f 100644 --- a/firmware/controllers/generated/signature_alphax-4chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-4chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2615559474 -#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-4chan_f7.2615559474" +#define SIGNATURE_HASH 712797674 +#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-4chan_f7.712797674" diff --git a/firmware/controllers/generated/signature_alphax-8chan.h b/firmware/controllers/generated/signature_alphax-8chan.h index 2ef15589f9..c8e77d09e0 100644 --- a/firmware/controllers/generated/signature_alphax-8chan.h +++ b/firmware/controllers/generated/signature_alphax-8chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1727645517 -#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-8chan.1727645517" +#define SIGNATURE_HASH 3613650837 +#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-8chan.3613650837" diff --git a/firmware/controllers/generated/signature_alphax-8chan_f7.h b/firmware/controllers/generated/signature_alphax-8chan_f7.h index f367f659c3..6aa455ff22 100644 --- a/firmware/controllers/generated/signature_alphax-8chan_f7.h +++ b/firmware/controllers/generated/signature_alphax-8chan_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1727645517 -#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-8chan_f7.1727645517" +#define SIGNATURE_HASH 3613650837 +#define TS_SIGNATURE "rusEFI master.2023.08.09.alphax-8chan_f7.3613650837" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index bdcb2207f8..ed37a6faae 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1051746073 -#define TS_SIGNATURE "rusEFI master.2023.08.09.atlas.1051746073" +#define SIGNATURE_HASH 2401925057 +#define TS_SIGNATURE "rusEFI master.2023.08.09.atlas.2401925057" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index 9522a83642..9b6a024923 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 442345352 -#define TS_SIGNATURE "rusEFI master.2023.08.09.core8.442345352" +#define SIGNATURE_HASH 2881982288 +#define TS_SIGNATURE "rusEFI master.2023.08.09.core8.2881982288" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 19e0cd6c1c..4b7c8ecf0f 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on hellen_cypress_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.cypress.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.cypress.2480964326" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index 592d8f80c6..4d042c85dd 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2170697733 -#define TS_SIGNATURE "rusEFI master.2023.08.09.f407-discovery.2170697733" +#define SIGNATURE_HASH 821563613 +#define TS_SIGNATURE "rusEFI master.2023.08.09.f407-discovery.821563613" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index a1b5af8ccf..94d8ec6e43 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.f429-discovery.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.f429-discovery.2480964326" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index eb055d4cb2..743ed8c210 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2640628 -#define TS_SIGNATURE "rusEFI master.2023.08.09.frankenso_na6.2640628" +#define SIGNATURE_HASH 2981257772 +#define TS_SIGNATURE "rusEFI master.2023.08.09.frankenso_na6.2981257772" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index f8f3e0ce64..b9e3a5a41a 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3786611300 -#define TS_SIGNATURE "rusEFI master.2023.08.09.harley81.3786611300" +#define SIGNATURE_HASH 1344877244 +#define TS_SIGNATURE "rusEFI master.2023.08.09.harley81.1344877244" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index 9e35cc3f78..8e5527a9a6 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2458393806 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-gm-e67.2458393806" +#define SIGNATURE_HASH 588395542 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-gm-e67.588395542" diff --git a/firmware/controllers/generated/signature_hellen-honda-k.h b/firmware/controllers/generated/signature_hellen-honda-k.h index b1fbd750d2..a420faffcd 100644 --- a/firmware/controllers/generated/signature_hellen-honda-k.h +++ b/firmware/controllers/generated/signature_hellen-honda-k.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3738080684 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-honda-k.3738080684" +#define SIGNATURE_HASH 1867824500 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-honda-k.1867824500" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 3f043e0121..4d1d9752c9 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 536654936 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-nb1.536654936" +#define SIGNATURE_HASH 2925960320 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen-nb1.2925960320" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 45c70d33aa..96c9bd5496 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2887673514 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen121nissan.2887673514" +#define SIGNATURE_HASH 495210098 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen121nissan.495210098" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 5fcf7a5015..d3d1aa159c 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3053762045 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen121vag.3053762045" +#define SIGNATURE_HASH 127835429 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen121vag.127835429" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 03676b9550..70497504f4 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3987221844 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen128.3987221844" +#define SIGNATURE_HASH 1546782092 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen128.1546782092" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index be72b0522b..89dd0a699d 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1271705682 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen154hyundai.1271705682" +#define SIGNATURE_HASH 4199979146 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen154hyundai.4199979146" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index a5a61192ed..41736d1b90 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1312730131 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen72.1312730131" +#define SIGNATURE_HASH 4288971979 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen72.4288971979" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 15403f70b3..fbd31b5405 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3576311507 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen81.3576311507" +#define SIGNATURE_HASH 1689257483 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen81.1689257483" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 2a0dce0dd3..276e71dccd 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2999693735 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen88bmw.2999693735" +#define SIGNATURE_HASH 55679359 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellen88bmw.55679359" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 9072ad2ba6..8f5449f64b 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3380033050 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellenNA6.3380033050" +#define SIGNATURE_HASH 2028805826 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellenNA6.2028805826" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index 66e67fc26b..3f20dc93c3 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2142020887 -#define TS_SIGNATURE "rusEFI master.2023.08.09.hellenNA8_96.2142020887" +#define SIGNATURE_HASH 3459681743 +#define TS_SIGNATURE "rusEFI master.2023.08.09.hellenNA8_96.3459681743" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 9d515548db..78ea41ae92 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on kinetis_gen_config.bat by SignatureConsumer // -#define SIGNATURE_HASH 1252854002 -#define TS_SIGNATURE "rusEFI master.2023.08.09.kin.1252854002" +#define SIGNATURE_HASH 4214693930 +#define TS_SIGNATURE "rusEFI master.2023.08.09.kin.4214693930" diff --git a/firmware/controllers/generated/signature_m74_9.h b/firmware/controllers/generated/signature_m74_9.h index ce29cc0479..81388e8c2c 100644 --- a/firmware/controllers/generated/signature_m74_9.h +++ b/firmware/controllers/generated/signature_m74_9.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 943830576 -#define TS_SIGNATURE "rusEFI master.2023.08.09.m74_9.943830576" +#define SIGNATURE_HASH 2312871656 +#define TS_SIGNATURE "rusEFI master.2023.08.09.m74_9.2312871656" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index a6e19dce3c..9d44d28c4f 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 479119545 -#define TS_SIGNATURE "rusEFI master.2023.08.09.mre_f4.479119545" +#define SIGNATURE_HASH 2903826529 +#define TS_SIGNATURE "rusEFI master.2023.08.09.mre_f4.2903826529" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index dc62cf1c29..f462995973 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 479119545 -#define TS_SIGNATURE "rusEFI master.2023.08.09.mre_f7.479119545" +#define SIGNATURE_HASH 2903826529 +#define TS_SIGNATURE "rusEFI master.2023.08.09.mre_f7.2903826529" diff --git a/firmware/controllers/generated/signature_nucleo_f429.h b/firmware/controllers/generated/signature_nucleo_f429.h index 56ed9b1252..74b54c88c5 100644 --- a/firmware/controllers/generated/signature_nucleo_f429.h +++ b/firmware/controllers/generated/signature_nucleo_f429.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_f429.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_f429.2480964326" diff --git a/firmware/controllers/generated/signature_nucleo_f767.h b/firmware/controllers/generated/signature_nucleo_f767.h index 3baf746e00..1548154f73 100644 --- a/firmware/controllers/generated/signature_nucleo_f767.h +++ b/firmware/controllers/generated/signature_nucleo_f767.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_f767.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_f767.2480964326" diff --git a/firmware/controllers/generated/signature_nucleo_h743.h b/firmware/controllers/generated/signature_nucleo_h743.h index 40cc3fb2ba..be203d411d 100644 --- a/firmware/controllers/generated/signature_nucleo_h743.h +++ b/firmware/controllers/generated/signature_nucleo_h743.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_h743.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.nucleo_h743.2480964326" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index e57fa584fd..e7fab569f2 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 317613998 -#define TS_SIGNATURE "rusEFI master.2023.08.09.prometheus_405.317613998" +#define SIGNATURE_HASH 2742308726 +#define TS_SIGNATURE "rusEFI master.2023.08.09.prometheus_405.2742308726" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 28ccd4c80a..08e3ff477f 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 317613998 -#define TS_SIGNATURE "rusEFI master.2023.08.09.prometheus_469.317613998" +#define SIGNATURE_HASH 2742308726 +#define TS_SIGNATURE "rusEFI master.2023.08.09.prometheus_469.2742308726" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 0c16037dd5..33a348c512 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 425940594 -#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_f4.425940594" +#define SIGNATURE_HASH 2834923178 +#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_f4.2834923178" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 8078769d93..7e1ae789bc 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 425940594 -#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_f7.425940594" +#define SIGNATURE_HASH 2834923178 +#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_f7.2834923178" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 89f21d3ec3..912494075a 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 425940594 -#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_h7.425940594" +#define SIGNATURE_HASH 2834923178 +#define TS_SIGNATURE "rusEFI master.2023.08.09.proteus_h7.2834923178" diff --git a/firmware/controllers/generated/signature_s105.h b/firmware/controllers/generated/signature_s105.h index 1dcb777678..b5b7b802fa 100644 --- a/firmware/controllers/generated/signature_s105.h +++ b/firmware/controllers/generated/signature_s105.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 1176588130 -#define TS_SIGNATURE "rusEFI master.2023.08.09.s105.1176588130" +#define SIGNATURE_HASH 4156254138 +#define TS_SIGNATURE "rusEFI master.2023.08.09.s105.4156254138" diff --git a/firmware/controllers/generated/signature_small-can.h b/firmware/controllers/generated/signature_small-can.h index de8189c5b6..0eabc0c223 100644 --- a/firmware/controllers/generated/signature_small-can.h +++ b/firmware/controllers/generated/signature_small-can.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 3370894874 -#define TS_SIGNATURE "rusEFI master.2023.08.09.small-can.3370894874" +#define SIGNATURE_HASH 2037509826 +#define TS_SIGNATURE "rusEFI master.2023.08.09.small-can.2037509826" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 53593513e5..1c83048db6 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 636972329 -#define TS_SIGNATURE "rusEFI master.2023.08.09.subaru_eg33_f7.636972329" +#define SIGNATURE_HASH 2490189297 +#define TS_SIGNATURE "rusEFI master.2023.08.09.subaru_eg33_f7.2490189297" diff --git a/firmware/controllers/generated/signature_t-b-g.h b/firmware/controllers/generated/signature_t-b-g.h index cd6a2f3a00..0d09e7bf89 100644 --- a/firmware/controllers/generated/signature_t-b-g.h +++ b/firmware/controllers/generated/signature_t-b-g.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 578464318 -#define TS_SIGNATURE "rusEFI master.2023.08.09.t-b-g.578464318" +#define SIGNATURE_HASH 2480964326 +#define TS_SIGNATURE "rusEFI master.2023.08.09.t-b-g.2480964326" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 40e23d81a8..073c7570c1 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool config_definition.jar based on gen_config.sh by SignatureConsumer // -#define SIGNATURE_HASH 2832500252 -#define TS_SIGNATURE "rusEFI master.2023.08.09.tdg-pdm8.2832500252" +#define SIGNATURE_HASH 424586948 +#define TS_SIGNATURE "rusEFI master.2023.08.09.tdg-pdm8.424586948" diff --git a/firmware/controllers/lua/generated/output_lookup_generated.cpp b/firmware/controllers/lua/generated/output_lookup_generated.cpp index ab326a6407..2e559fbf62 100644 --- a/firmware/controllers/lua/generated/output_lookup_generated.cpp +++ b/firmware/controllers/lua/generated/output_lookup_generated.cpp @@ -1071,6 +1071,16 @@ float getOutputValueByName(const char *name) { case 989545496: return engine->triggerCentral.triggerIgnoredToothCount; #endif +// mapCamPrevToothAngle +#if EFI_SHAFT_POSITION_INPUT + case 1581624998: + return engine->triggerCentral.mapCamPrevToothAngle; +#endif +// isDecodingMapCam +#if EFI_SHAFT_POSITION_INPUT + case 756216589: + return engine->triggerCentral.isDecodingMapCam; +#endif // dcOutput0 case 1242329357: return engine->dc_motors.dcOutput0; diff --git a/firmware/controllers/trigger/trigger_central_generated.h b/firmware/controllers/trigger/trigger_central_generated.h index 702e4f699e..354c4929f8 100644 --- a/firmware/controllers/trigger/trigger_central_generated.h +++ b/firmware/controllers/trigger/trigger_central_generated.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Mar 29 00:38:14 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -60,8 +60,110 @@ struct trigger_central_s { * offset 49 */ uint8_t alignmentFill_at_49[3]; + /** + * Sync: MAP: prev angle + deg + * offset 52 + */ + angle_t mapCamPrevToothAngle = (angle_t)0; + /** + offset 56 bit 0 */ + bool isDecodingMapCam : 1 {}; + /** + offset 56 bit 1 */ + bool unusedBit_13_1 : 1 {}; + /** + offset 56 bit 2 */ + bool unusedBit_13_2 : 1 {}; + /** + offset 56 bit 3 */ + bool unusedBit_13_3 : 1 {}; + /** + offset 56 bit 4 */ + bool unusedBit_13_4 : 1 {}; + /** + offset 56 bit 5 */ + bool unusedBit_13_5 : 1 {}; + /** + offset 56 bit 6 */ + bool unusedBit_13_6 : 1 {}; + /** + offset 56 bit 7 */ + bool unusedBit_13_7 : 1 {}; + /** + offset 56 bit 8 */ + bool unusedBit_13_8 : 1 {}; + /** + offset 56 bit 9 */ + bool unusedBit_13_9 : 1 {}; + /** + offset 56 bit 10 */ + bool unusedBit_13_10 : 1 {}; + /** + offset 56 bit 11 */ + bool unusedBit_13_11 : 1 {}; + /** + offset 56 bit 12 */ + bool unusedBit_13_12 : 1 {}; + /** + offset 56 bit 13 */ + bool unusedBit_13_13 : 1 {}; + /** + offset 56 bit 14 */ + bool unusedBit_13_14 : 1 {}; + /** + offset 56 bit 15 */ + bool unusedBit_13_15 : 1 {}; + /** + offset 56 bit 16 */ + bool unusedBit_13_16 : 1 {}; + /** + offset 56 bit 17 */ + bool unusedBit_13_17 : 1 {}; + /** + offset 56 bit 18 */ + bool unusedBit_13_18 : 1 {}; + /** + offset 56 bit 19 */ + bool unusedBit_13_19 : 1 {}; + /** + offset 56 bit 20 */ + bool unusedBit_13_20 : 1 {}; + /** + offset 56 bit 21 */ + bool unusedBit_13_21 : 1 {}; + /** + offset 56 bit 22 */ + bool unusedBit_13_22 : 1 {}; + /** + offset 56 bit 23 */ + bool unusedBit_13_23 : 1 {}; + /** + offset 56 bit 24 */ + bool unusedBit_13_24 : 1 {}; + /** + offset 56 bit 25 */ + bool unusedBit_13_25 : 1 {}; + /** + offset 56 bit 26 */ + bool unusedBit_13_26 : 1 {}; + /** + offset 56 bit 27 */ + bool unusedBit_13_27 : 1 {}; + /** + offset 56 bit 28 */ + bool unusedBit_13_28 : 1 {}; + /** + offset 56 bit 29 */ + bool unusedBit_13_29 : 1 {}; + /** + offset 56 bit 30 */ + bool unusedBit_13_30 : 1 {}; + /** + offset 56 bit 31 */ + bool unusedBit_13_31 : 1 {}; }; -static_assert(sizeof(trigger_central_s) == 52); +static_assert(sizeof(trigger_central_s) == 60); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Mar 29 00:38:14 UTC 2023 +// this section was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Aug 09 09:38:59 UTC 2023 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 13c11875f6..d724cf956a 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.f407-discovery.2170697733" + signature = "rusEFI master.2023.08.09.f407-discovery.821563613" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.f407-discovery.2170697733" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.f407-discovery.821563613" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:24 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:59 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5945,8 +5949,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5965,6 +5972,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 6e86ee8288..0f504d51cd 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.48way.1721770628" + signature = "rusEFI master.2023.08.09.48way.3610905180" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.48way.1721770628" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.48way.3610905180" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Battery Reference Input (A0)","TPS Reference Input (A1)","CLT Reference Input (A2)","IAT Reference Input (A3)","O2 Reference Input (A4)","INVALID","INVALID","INVALID","MAP Pressure Reference Input (B0)","BARO Pressure Reference Input (B1)","INVALID","INVALID","INVALID","INVALID","Fuel Pressure Reference Input (C4)","Oil Pressure Reference Input (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:44 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:11 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5945,8 +5949,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5965,6 +5972,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index fce952f532..3b779f2aac 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.alphax-2chan.1525401147" + signature = "rusEFI master.2023.08.09.alphax-2chan.3950112483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.alphax-2chan.1525401147" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.alphax-2chan.3950112483" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","INVALID","B5 - TPS","A2 Battery Sense","C7 - CAM Hall/Digital","INVALID","INVALID","INVALID","INVALID","B2 - MAP","B7 - CLT","B3 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:10 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5941,8 +5945,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5961,6 +5968,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index adbd2e79b5..ffc0870154 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.alphax-4chan.2615559474" + signature = "rusEFI master.2023.08.09.alphax-4chan.712797674" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.alphax-4chan.2615559474" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.alphax-4chan.712797674" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:54 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:13 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini index fdc5e1b35c..efbb7b2e91 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.alphax-4chan_f7.2615559474" + signature = "rusEFI master.2023.08.09.alphax-4chan_f7.712797674" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.alphax-4chan_f7.2615559474" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.alphax-4chan_f7.712797674" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - O2","On-board MAP","D5 - PPS","B5 - TPS","F7 - Ignition Key Voltage","C7 - CAM Hall/Digital","INVALID","D4 - TPS2","INVALID","X5 - AIN3","B2 - MAP","B7 - CLT","B3 - IAT","F6 - PPS2","X5 - AIN4","INVALID","INVALID","INVALID","INVALID","D5 - PPS rev G" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:16 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini index c38ef5e86f..ad58c51c64 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.alphax-8chan.1727645517" + signature = "rusEFI master.2023.08.09.alphax-8chan.3613650837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.alphax-8chan.1727645517" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.alphax-8chan.3613650837" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","6C - PPS1","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:59 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:19 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini index afddfdd36e..73e28244d2 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-8chan_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.alphax-8chan_f7.1727645517" + signature = "rusEFI master.2023.08.09.alphax-8chan_f7.3613650837" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.alphax-8chan_f7.1727645517" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.alphax-8chan_f7.3613650837" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","17A - PPS","23C - TPS","Battery Sense","INVALID","15D - AN5","24C - TPS2","14A - Analog 1","22A - Analog 22","On-board MAP","16A - CLT","15A - IAT","6C - PPS1","33A - AN3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","16D - AN6","INVALID","INVALID","INVALID","INVALID","7C - AT4","INVALID","6C - AT3","14D - AN4" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:01 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:21 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index f4f79c33b7..d1bbfedafe 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.atlas.1051746073" + signature = "rusEFI master.2023.08.09.atlas.2401925057" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.atlas.1051746073" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.atlas.2401925057" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:15 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:49 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 64c0548724..fe60ff4d2c 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.core8.442345352" + signature = "rusEFI master.2023.08.09.core8.2881982288" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.core8.442345352" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.core8.2881982288" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","On-board Battery Sense (A0)","Analog Inputs 1 (A1)","Analog Inputs 2 (A2)","Analog Inputs 3 (A3)","Analog Inputs 4 (A4)","On-board MAP (A5)","Analog Inputs 6 (A6)","Analog Inputs 7 (A7)","On-board BARO (B0)","Analog Inputs 9 (B1)","Analog Inputs 10 (C0)","Primary On-board O2 (C1)","Secondary On-board O2 (C2)","Analog Inputs 13 (C3)","Analog Inputs 14 (C4)","Analog Inputs 15 (C5)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:41 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:08 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5945,8 +5949,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5965,6 +5972,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index a16e4f8639..4a73a70d3d 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.cypress.578464318" + signature = "rusEFI master.2023.08.09.cypress.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.cypress.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.cypress.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:07 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 624b32531d..0ab43d8302 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.f407-discovery.2170697733" + signature = "rusEFI master.2023.08.09.f407-discovery.821563613" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.f407-discovery.2170697733" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.f407-discovery.821563613" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:54 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5945,8 +5949,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5965,6 +5972,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 271d497c59..a6cc5d12c2 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.f429-discovery.578464318" + signature = "rusEFI master.2023.08.09.f429-discovery.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.f429-discovery.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.f429-discovery.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:07 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:38 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a0606f3154..f75faf55c1 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.frankenso_na6.2640628" + signature = "rusEFI master.2023.08.09.frankenso_na6.2981257772" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.frankenso_na6.2640628" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.frankenso_na6.2981257772" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog 3O","Analog 3L","Analog 3M","Analog 3J","Analog 3I","INVALID","Analog 3H","Analog 3G","INVALID","INVALID","INVALID","Analog 3P","Analog 3Q","Analog 3N","Analog VBatt","Analog 3E" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:53 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:22 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 07565550f5..f833db5120 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.harley81.3786611300" + signature = "rusEFI master.2023.08.09.harley81.1344877244" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.harley81.3786611300" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.harley81.1344877244" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","27 - TPS 2","INVALID","41 - PPS 1","52 - TPS 1","5 Battery Sense","INVALID","INVALID","42 - PPS 2","INVALID","53 - MAP","55 Engine Temperature","49 CLT","72 IAT","32 Oil Pressure","34 Kickstand Position Sensor" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:24 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 9cef111a56..79e03aaf6b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen-gm-e67.2458393806" + signature = "rusEFI master.2023.08.09.hellen-gm-e67.588395542" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen-gm-e67.2458393806" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen-gm-e67.588395542" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","C2-60 - Oil Pressure","C3-58 - Baro","C1-47 - PPS1","C2-64 - TPS1","C1-19 Battery Sense","C1-45 Secondary Fuel Level","C3-57 - A/C Pressure","C2-66 - TPS2","C1-44 Primary Fuel Level","C2-65 - Trans Fluids","C3-59 - MAP","C3-55 - CLT","C3-56 - IAT","C1-49 - PPS2","C1-46 Vac Sense" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:27 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:52 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini index 61a180edb5..b88dc9eeaf 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-honda-k.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen-honda-k.3738080684" + signature = "rusEFI master.2023.08.09.hellen-honda-k.1867824500" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen-honda-k.3738080684" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen-honda-k.1867824500" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","A15 TPS","E9 Ignition Key Voltage","INVALID","INVALID","INVALID","INVALID","A19 - MAP","INVALID","B8 - CLT","B17 IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:35 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index b9c245888f..a675d1f3e5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen-nb1.536654936" + signature = "rusEFI master.2023.08.09.hellen-nb1.2925960320" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen-nb1.536654936" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen-nb1.2925960320" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:25 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:49 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index d17e6721de..e501a4ff3b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen121nissan.2887673514" + signature = "rusEFI master.2023.08.09.hellen121nissan.495210098" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen121nissan.2887673514" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen121nissan.495210098" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","51 - MAF","INVALID","Aux P68","106 - PPS 1","50 - TPS 1","109 Ignition Key Voltage","INVALID","INVALID","69 - TPS 2","INVALID","Aux P66","Aux P67","73 - CLT","34 - IAT","98 - PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:11 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:33 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 570ef5eb9d..49ec480adb 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen121vag.3053762045" + signature = "rusEFI master.2023.08.09.hellen121vag.127835429" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen121vag.3053762045" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen121vag.127835429" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:30 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index ed1f3196d4..ceb1617287 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen128.3987221844" + signature = "rusEFI master.2023.08.09.hellen128.1546782092" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen128.3987221844" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen128.1546782092" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","P36_IN_O2S","P32_IN_O2S2","P40_IN_MAP3","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2","P41_IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:06 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:27 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index ed6cdda01a..aea7e149b7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen154hyundai.1271705682" + signature = "rusEFI master.2023.08.09.hellen154hyundai.4199979146" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen154hyundai.1271705682" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen154hyundai.4199979146" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","K21 Ambient Temperature","K58 Oil Temp","A/C pressure","PPS 1","TPS 1","K2 Ignition Key Voltage","X10 AIN2","INVALID","TPS 2","X11 AIN1","Map Sensor K31","K10 Sensor","CLT","IAT","PPS 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:16 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:38 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 778f1bba1d..4eff00b50f 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen72.1312730131" + signature = "rusEFI master.2023.08.09.hellen72.4288971979" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen72.1312730131" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen72.4288971979" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","5N - TPS2","3L - IGN_7 / AFR","intMAP (A15)","5P - PPS1","4V - TPS (A17)","4S/4T - Alternator voltage","3V - CAM (A19)","4J - VTCS/AUX4 (A20)","4F - AC_PRES/AUX1 (A23)","3Y - CRANK (A24)","4X - MAF (A9)","4U - MAP2/Ign8 (A10)","4P - CLT (A11)","4N - IAT (A14)","5M - PPS2 OR TEMPERATURE SENSOR","4AE - EGR/MAP4 (A22)" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:20 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:44 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 4f6fc1c79c..b3737ed06b 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen81.3576311507" + signature = "rusEFI master.2023.08.09.hellen81.1689257483" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen81.3576311507" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen81.1689257483" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - IN_O2S","55 - IN_O2S2","41 - IN_MAP3","78 - IN_PPS","16 - IN_TPS","13 - IN_VIGN","79 - IN_CAM","77 - IN_AUX4","74 - IN_AUX1","15 - IN_CRANK (A24)","37 - IN_MAP1","38 - IN_MAP2","39 - IN_CLT","40 - IN_IAT","75 - IN_AUX2","76 - IN_AUX3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:23 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:46 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5942,8 +5946,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5962,6 +5969,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index b1718157a0..735bd21f1e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellen88bmw.2999693735" + signature = "rusEFI master.2023.08.09.hellen88bmw.55679359" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellen88bmw.2999693735" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellen88bmw.55679359" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","VIN5","VIN6","INVALID","PPS1","73 - TPS","56 - Battery Sense","17 - CAM","Aux BARO","Aux TPS2","16 - CRANK","41 - MAF","Aux MAP","78 - CLT","77 - IAT","Aux PPS2","Aux TPS3" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:41 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 241a6ebe83..ba19863512 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellenNA6.3380033050" + signature = "rusEFI master.2023.08.09.hellenNA6.2028805826" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellenNA6.3380033050" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellenNA6.2028805826" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","4I - PPS1","TPS Input","1B - Battery Sense","INVALID","4G - PPS2 OR TEMPERATURE SENSOR","4H - TPS2","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:30 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:55 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index c47733a913..d8e473fa23 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.hellenNA8_96.2142020887" + signature = "rusEFI master.2023.08.09.hellenNA8_96.3459681743" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.hellenNA8_96.2142020887" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.hellenNA8_96.3459681743" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","2C - O2S","TPS1","intMAP","PPS1","2F - TPS","3B - Battery Sense","3G - CAM","3S - EGR BOOST IN","2A - Pressure Input","3F - CRANK","2B - MAF","INVALID","2G - Coolant","2B - IAT","4C - IN TEMP/PPS2","1K - AC Switch" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:32 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:57 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 9cd25c0b30..dc480c06a3 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.kin.1252854002" + signature = "rusEFI master.2023.08.09.kin.4214693930" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.kin.1252854002" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.kin.4214693930" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="Disabled", "PA2", "PA3", "INVALID", "PD3", "INVALID", "INVALID", "INVALID", "PB12", "PB13", "INVALID", "PE2", "INVALID", "PC14", "PC15", "PC16", "PC17" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:47 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:05 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_m74_9.ini b/firmware/tunerstudio/generated/rusefi_m74_9.ini index 4d2790f666..9944c628ee 100644 --- a/firmware/tunerstudio/generated/rusefi_m74_9.ini +++ b/firmware/tunerstudio/generated/rusefi_m74_9.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.m74_9.943830576" + signature = "rusEFI master.2023.08.09.m74_9.2312871656" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.m74_9.943830576" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.m74_9.2312871656" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:46 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:14 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 2029889f8a..e3abee8084 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.mre_f4.479119545" + signature = "rusEFI master.2023.08.09.mre_f4.2903826529" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.mre_f4.479119545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.mre_f4.2903826529" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:39 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:05 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5104,6 +5106,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5946,8 +5950,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5966,6 +5973,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 679100a612..f7a3fede9b 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.mre_f7.479119545" + signature = "rusEFI master.2023.08.09.mre_f7.2903826529" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.mre_f7.479119545" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.mre_f7.2903826529" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","18 - AN temp 1","23 - AN temp 2","24 - AN temp 3","22 - AN temp 4","28 - AN volt 10, Aux Reuse","INVALID","26 - AN volt 2","31 - AN volt 3","36 - AN volt 8, Aux Reuse","40 - AN volt 9, Aux Reuse","27 - AN volt 1","Battery Sense","19 - AN volt 4","20 - AN volt 5","32 - AN volt 6, Aux Reuse","30 - AN volt 7" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:37 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:03 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5104,6 +5106,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5946,8 +5950,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5966,6 +5973,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini index f9592d07b0..bb99392c0b 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f429.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.nucleo_f429.578464318" + signature = "rusEFI master.2023.08.09.nucleo_f429.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.nucleo_f429.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.nucleo_f429.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:09 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:41 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini index 5c92dbaa89..39d2d9588d 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_f767.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.nucleo_f767.578464318" + signature = "rusEFI master.2023.08.09.nucleo_f767.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.nucleo_f767.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.nucleo_f767.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:11 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:43 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini index 1ebfb96095..3fabb6fc6a 100644 --- a/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini +++ b/firmware/tunerstudio/generated/rusefi_nucleo_h743.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.nucleo_h743.578464318" + signature = "rusEFI master.2023.08.09.nucleo_h743.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.nucleo_h743.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.nucleo_h743.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:13 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:46 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index ab2ca09f79..d9691e24fa 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.prometheus_405.317613998" + signature = "rusEFI master.2023.08.09.prometheus_405.2742308726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.prometheus_405.317613998" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.prometheus_405.2742308726" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:57 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:27 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5938,8 +5942,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5958,6 +5965,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 12fcb5ed35..26a2934ace 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.prometheus_469.317613998" + signature = "rusEFI master.2023.08.09.prometheus_469.2742308726" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.prometheus_469.317613998" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.prometheus_469.2742308726" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:55 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:25 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5938,8 +5942,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5958,6 +5965,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 27575274a1..ae8ec9e9c0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.proteus_f4.425940594" + signature = "rusEFI master.2023.08.09.proteus_f4.2834923178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.proteus_f4.425940594" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.proteus_f4.2834923178" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:02 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:33 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5954,8 +5958,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5974,6 +5981,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 33788c2b40..8ad75475e4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.proteus_f7.425940594" + signature = "rusEFI master.2023.08.09.proteus_f7.2834923178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.proteus_f7.425940594" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.proteus_f7.2834923178" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:00 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:30 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5954,8 +5958,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5974,6 +5981,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index 05cb517c8d..46235099cf 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.proteus_h7.425940594" + signature = "rusEFI master.2023.08.09.proteus_h7.2834923178" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.proteus_h7.425940594" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.proteus_h7.2834923178" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","Analog Volt 5","Analog Volt 6","Analog Volt 7","Analog Volt 8","Analog Volt 9","Analog Volt 10","Analog Volt 11","Battery Sense","Analog Temp 3","Analog Temp 4","Analog Volt 1","Analog Volt 2","Analog Volt 3","Analog Volt 4","Analog Temp 1","Analog Temp 2" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:04 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:35 UTC 2023 pageSize = 27468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 27458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5954,8 +5958,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5974,6 +5981,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_s105.ini b/firmware/tunerstudio/generated/rusefi_s105.ini index 1ad06420e6..fe00f37a65 100644 --- a/firmware/tunerstudio/generated/rusefi_s105.ini +++ b/firmware/tunerstudio/generated/rusefi_s105.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.s105.1176588130" + signature = "rusEFI master.2023.08.09.s105.4156254138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.s105.1176588130" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.s105.4156254138" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","56 - MAP","16 - TPS","19 - Knock","39 - CLT","INVALID","opt 55 - AFR 2","opt 21 - AC Press","18 - AFR 1","13 - Ignition switch in (15)","44 - +12 sense (MR)","INVALID","na 37 - MAF","INVALID","INVALID","40 - IAT" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:48 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:16 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5944,8 +5948,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5964,6 +5971,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_small-can.ini b/firmware/tunerstudio/generated/rusefi_small-can.ini index b23caa131c..65f02e0e51 100644 --- a/firmware/tunerstudio/generated/rusefi_small-can.ini +++ b/firmware/tunerstudio/generated/rusefi_small-can.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.small-can.3370894874" + signature = "rusEFI master.2023.08.09.small-can.2037509826" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.small-can.3370894874" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.small-can.2037509826" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","B4 - Analog input","INVALID","INVALID","INVALID","A2 Battery Sense","INVALID","INVALID","INVALID","INVALID","INVALID","B2 - Analog input" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:34 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:00 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5942,8 +5946,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5962,6 +5969,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 851c2f1d6e..47d61c5526 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.subaru_eg33_f7.636972329" + signature = "rusEFI master.2023.08.09.subaru_eg33_f7.2490189297" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.subaru_eg33_f7.636972329" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.subaru_eg33_f7.2490189297" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","AUX0_18 - MAP Ain","INVALID","INVALID","B05 - MAF Ain","INVALID","AUX0_19 - IAT Ain","A02 - VBat","INVALID","A06 - Oxyg 2 Ain","A04 - EGR t Ain","INVALID","A18 - AUX0 Ain","B02 - TPS Ain","INVALID","A03 - Coolant t Ain","A06 - Oxyg 1 Ain" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 08:59:49 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:39:07 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_t-b-g.ini b/firmware/tunerstudio/generated/rusefi_t-b-g.ini index 84f9192de3..0a9e1ecb41 100644 --- a/firmware/tunerstudio/generated/rusefi_t-b-g.ini +++ b/firmware/tunerstudio/generated/rusefi_t-b-g.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.t-b-g.578464318" + signature = "rusEFI master.2023.08.09.t-b-g.2480964326" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.t-b-g.578464318" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.t-b-g.2480964326" ; 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 @@ -92,7 +92,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.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:00:51 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:19 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 99aff229f3..d27131e7fd 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -34,12 +34,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI master.2023.08.09.tdg-pdm8.2832500252" + signature = "rusEFI master.2023.08.09.tdg-pdm8.424586948" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature= "rusEFI master.2023.08.09.tdg-pdm8.2832500252" ; signature is expected to be 7 or more characters. + signature= "rusEFI master.2023.08.09.tdg-pdm8.424586948" ; 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 @@ -92,7 +92,7 @@ enable2ndByteCanID = false #define adc_channel_e_list="NONE","INVALID","INVALID","INVALID","INVALID","Battery Sense","INVALID","INVALID","INVALID","Sense 7","Sense 8","Sense 1","Sense 2","Sense 3","Sense 4","Sense 5","Sense 6" ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:18 UTC 2023 +; this section was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:51 UTC 2023 pageSize = 23468 page = 1 @@ -2273,7 +2273,7 @@ lambdaMaxDeviationRpmBins = array, U16, 23458, [4], "RPM", 1, 0, 0, 18000, 0 ochGetCommand = "O%2o%2c" ; see TS_OUTPUT_SIZE in console source code - ochBlockSize = 1392 + ochBlockSize = 1400 ; 11.2.3 Full Optimized – High Speed scatteredOchGetCommand = 9 @@ -2971,88 +2971,90 @@ mapVvt_map_peak = scalar, U08, 1205, "", 1, 0 currentEngineDecodedPhase = scalar, F32, 1208, "deg", 1, 0 triggerToothAngleError = scalar, F32, 1212, "deg", 1, 0 triggerIgnoredToothCount = scalar, U08, 1216, "", 1, 0 -; total TS size = 1220 -crankSynchronizationCounter = scalar, U32, 1220, "", 1, 0 -vvtSyncGapRatio = scalar, F32, 1224, "", 1, 0 -vvtToothDurations0 = scalar, U32, 1228, "us", 1, 0 -vvtCurrentPosition = scalar, F32, 1232, "", 1, 0 -triggerSyncGapRatio = scalar, F32, 1236, "", 1, 0 -triggerStateIndex = scalar, U08, 1240, "", 1, 0 -vvtCounter = scalar, U08, 1241, "", 1, 0 -camResyncCounter = scalar, U08, 1242, "", 1, 0 -vvtStateIndex = scalar, U08, 1243, "", 1, 0 -; total TS size = 1244 -m_hasSynchronizedPhase = bits, U32, 1244, [0:0] -; total TS size = 1248 -wallFuelCorrection = scalar, F32, 1248, "", 1, 0 -wallFuel = scalar, F32, 1252, "", 1, 0 +mapCamPrevToothAngle = scalar, F32, 1220, "deg", 1, 0 +isDecodingMapCam = bits, U32, 1224, [0:0] +; total TS size = 1228 +crankSynchronizationCounter = scalar, U32, 1228, "", 1, 0 +vvtSyncGapRatio = scalar, F32, 1232, "", 1, 0 +vvtToothDurations0 = scalar, U32, 1236, "us", 1, 0 +vvtCurrentPosition = scalar, F32, 1240, "", 1, 0 +triggerSyncGapRatio = scalar, F32, 1244, "", 1, 0 +triggerStateIndex = scalar, U08, 1248, "", 1, 0 +vvtCounter = scalar, U08, 1249, "", 1, 0 +camResyncCounter = scalar, U08, 1250, "", 1, 0 +vvtStateIndex = scalar, U08, 1251, "", 1, 0 +; total TS size = 1252 +m_hasSynchronizedPhase = bits, U32, 1252, [0:0] ; total TS size = 1256 -idleState = bits, S32, 1256, [0:2], "not important" -currentIdlePosition = scalar, F32, 1260 -baseIdlePosition = scalar, F32, 1264 -iacByTpsTaper = scalar, F32, 1268 -throttlePedalUpState = scalar, S32, 1272, "", 1, 0 -mightResetPid = bits, U32, 1276, [0:0] -shouldResetPid = bits, U32, 1276, [1:1] -wasResetPid = bits, U32, 1276, [2:2] -mustResetPid = bits, U32, 1276, [3:3] -isCranking = bits, U32, 1276, [4:4] -isIacTableForCoasting = bits, U32, 1276, [5:5] -notIdling = bits, U32, 1276, [6:6] -needReset = bits, U32, 1276, [7:7] -isInDeadZone = bits, U32, 1276, [8:8] -isBlipping = bits, U32, 1276, [9:9] -useClosedLoop = bits, U32, 1276, [10:10] -badTps = bits, U32, 1276, [11:11] -looksLikeRunning = bits, U32, 1276, [12:12] -looksLikeCoasting = bits, U32, 1276, [13:13] -looksLikeCrankToIdle = bits, U32, 1276, [14:14] -isVerboseIAC = bits, U32, 1276, [15:15] -isIdleCoasting = bits, U32, 1276, [16:16] -targetRpmByClt = scalar, S32, 1280, "", 1, 0 -targetRpmAcBump = scalar, S32, 1284, "", 1, 0 -iacByRpmTaper = scalar, F32, 1288 -luaAdd = scalar, F32, 1292 -; total TS size = 1296 -idlePosition = scalar, F32, 1296, "per", 1,0 -trim = scalar, F32, 1300, "", 1, 0 -luaAdjustment = scalar, F32, 1304, "per", 1,0 -m_wastegatePosition = scalar, F32, 1308, "per", 1,0 -etbFeedForward = scalar, F32, 1312 -etbIntegralError = scalar, F32, 1316, "", 1, 0 -etbCurrentTarget = scalar, F32, 1320, "%", 1, 0 -etbCurrentAdjustedTarget = scalar, F32, 1324, "%", 1, 0 -etbRevLimitActive = bits, U32, 1328, [0:0] -jamDetected = bits, U32, 1328, [1:1] -etbDutyRateOfChange = scalar, F32, 1332, "per", 1,0 -etbDutyAverage = scalar, F32, 1336, "per", 1,0 -etbTpsErrorCounter = scalar, U16, 1340, "count", 1,0 -etbPpsErrorCounter = scalar, U16, 1342, "count", 1,0 -etbErrorCode = scalar, S08, 1344, "", 1, 0 -jamTimer = scalar, U16, 1346, "sec", 0.01, 0 -; total TS size = 1348 -faultCode = scalar, U08, 1348, "", 1, 0 -heaterDuty = scalar, U08, 1349, "%", 1, 0 -pumpDuty = scalar, U08, 1350, "%", 1, 0 -tempC = scalar, U16, 1352, "C", 1, 0 -nernstVoltage = scalar, U16, 1354, "V", 0.001, 0 -esr = scalar, U16, 1356, "ohm", 1, 0 -; total TS size = 1360 -dcOutput0 = scalar, F32, 1360, "per", 1,0 -isEnabled0_int = scalar, U08, 1364, "per", 1,0 -isEnabled0 = bits, U32, 1368, [0:0] -; total TS size = 1372 -value0 = scalar, U16, 1372, "value", 1,0 -value1 = scalar, U16, 1374, "value", 1,0 -errorRate = scalar, F32, 1376, "ratio", 1,0 +wallFuelCorrection = scalar, F32, 1256, "", 1, 0 +wallFuel = scalar, F32, 1260, "", 1, 0 +; total TS size = 1264 +idleState = bits, S32, 1264, [0:2], "not important" +currentIdlePosition = scalar, F32, 1268 +baseIdlePosition = scalar, F32, 1272 +iacByTpsTaper = scalar, F32, 1276 +throttlePedalUpState = scalar, S32, 1280, "", 1, 0 +mightResetPid = bits, U32, 1284, [0:0] +shouldResetPid = bits, U32, 1284, [1:1] +wasResetPid = bits, U32, 1284, [2:2] +mustResetPid = bits, U32, 1284, [3:3] +isCranking = bits, U32, 1284, [4:4] +isIacTableForCoasting = bits, U32, 1284, [5:5] +notIdling = bits, U32, 1284, [6:6] +needReset = bits, U32, 1284, [7:7] +isInDeadZone = bits, U32, 1284, [8:8] +isBlipping = bits, U32, 1284, [9:9] +useClosedLoop = bits, U32, 1284, [10:10] +badTps = bits, U32, 1284, [11:11] +looksLikeRunning = bits, U32, 1284, [12:12] +looksLikeCoasting = bits, U32, 1284, [13:13] +looksLikeCrankToIdle = bits, U32, 1284, [14:14] +isVerboseIAC = bits, U32, 1284, [15:15] +isIdleCoasting = bits, U32, 1284, [16:16] +targetRpmByClt = scalar, S32, 1288, "", 1, 0 +targetRpmAcBump = scalar, S32, 1292, "", 1, 0 +iacByRpmTaper = scalar, F32, 1296 +luaAdd = scalar, F32, 1300 +; total TS size = 1304 +idlePosition = scalar, F32, 1304, "per", 1,0 +trim = scalar, F32, 1308, "", 1, 0 +luaAdjustment = scalar, F32, 1312, "per", 1,0 +m_wastegatePosition = scalar, F32, 1316, "per", 1,0 +etbFeedForward = scalar, F32, 1320 +etbIntegralError = scalar, F32, 1324, "", 1, 0 +etbCurrentTarget = scalar, F32, 1328, "%", 1, 0 +etbCurrentAdjustedTarget = scalar, F32, 1332, "%", 1, 0 +etbRevLimitActive = bits, U32, 1336, [0:0] +jamDetected = bits, U32, 1336, [1:1] +etbDutyRateOfChange = scalar, F32, 1340, "per", 1,0 +etbDutyAverage = scalar, F32, 1344, "per", 1,0 +etbTpsErrorCounter = scalar, U16, 1348, "count", 1,0 +etbPpsErrorCounter = scalar, U16, 1350, "count", 1,0 +etbErrorCode = scalar, S08, 1352, "", 1, 0 +jamTimer = scalar, U16, 1354, "sec", 0.01, 0 +; total TS size = 1356 +faultCode = scalar, U08, 1356, "", 1, 0 +heaterDuty = scalar, U08, 1357, "%", 1, 0 +pumpDuty = scalar, U08, 1358, "%", 1, 0 +tempC = scalar, U16, 1360, "C", 1, 0 +nernstVoltage = scalar, U16, 1362, "V", 0.001, 0 +esr = scalar, U16, 1364, "ohm", 1, 0 +; total TS size = 1368 +dcOutput0 = scalar, F32, 1368, "per", 1,0 +isEnabled0_int = scalar, U08, 1372, "per", 1,0 +isEnabled0 = bits, U32, 1376, [0:0] ; total TS size = 1380 -vvtTarget = scalar, U16, 1380, "deg", 0.1, 0 -vvtOutput = scalar, U08, 1382, "%", 0.5, 0 -; total TS size = 1384 -lambdaCurrentlyGood = bits, U32, 1384, [0:0] -lambdaMonitorCut = bits, U32, 1384, [1:1] -lambdaTimeSinceGood = scalar, U16, 1388, "sec", 0.01, 0 +value0 = scalar, U16, 1380, "value", 1,0 +value1 = scalar, U16, 1382, "value", 1,0 +errorRate = scalar, F32, 1384, "ratio", 1,0 +; total TS size = 1388 +vvtTarget = scalar, U16, 1388, "deg", 0.1, 0 +vvtOutput = scalar, U08, 1390, "%", 0.5, 0 ; total TS size = 1392 +lambdaCurrentlyGood = bits, U32, 1392, [0:0] +lambdaMonitorCut = bits, U32, 1392, [1:1] +lambdaTimeSinceGood = scalar, U16, 1396, "sec", 0.01, 0 +; total TS size = 1400 time = { timeNow } @@ -5103,6 +5105,8 @@ entry = mapVvt_map_peak, "mapVvt_map_peak", int, "%d" entry = currentEngineDecodedPhase, "Sync: Engine Phase", float, "%.3f" entry = triggerToothAngleError, "Sync: trigger angle error", float, "%.3f" entry = triggerIgnoredToothCount, "triggerIgnoredToothCount", int, "%d" +entry = mapCamPrevToothAngle, "Sync: MAP: prev angle", float, "%.3f" +entry = isDecodingMapCam, "isDecodingMapCam", int, "%d" entry = crankSynchronizationCounter, "sync: Crank sync counter", int, "%d" entry = vvtSyncGapRatio, "vvtSyncGapRatio", float, "%.3f" entry = vvtToothDurations0, "vvtToothDurations0", int, "%d" @@ -5943,8 +5947,11 @@ dialog = tps_accel_stateDialog, "tps_accel_state" graphLine = maxInjectedPerPeriod graphLine = cycleCnt +indicatorPanel = trigger_centralIndicatorPanel, 2 + indicator = {isDecodingMapCam}, "isDecodingMapCam No", "isDecodingMapCam Yes" dialog = trigger_centralDialog, "trigger_central" + panel = trigger_centralIndicatorPanel liveGraph = trigger_central_1_Graph, "Graph", South graphLine = hwEventCounters1 graphLine = hwEventCounters2 @@ -5963,6 +5970,7 @@ dialog = trigger_centralDialog, "trigger_central" liveGraph = trigger_central_4_Graph, "Graph", South graphLine = triggerToothAngleError graphLine = triggerIgnoredToothCount + graphLine = mapCamPrevToothAngle dialog = trigger_stateDialog, "trigger_state" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java index 9047e2148c..bcf376f27a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/DcMotors.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/dc_motors.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,10 +167,10 @@ public class DcMotors { public static final int PACK_MULT_VSS = 100; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1360); - public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1360); - public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1360); - public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1360); + public static final Field DCOUTPUT0 = Field.create("DCOUTPUT0", 0, FieldType.FLOAT).setBaseOffset(1368); + public static final Field ISENABLED0_INT = Field.create("ISENABLED0_INT", 4, FieldType.INT8).setScale(1.0).setBaseOffset(1368); + public static final Field ALIGNMENTFILL_AT_5 = Field.create("ALIGNMENTFILL_AT_5", 5, FieldType.INT8).setScale(1.0).setBaseOffset(1368); + public static final Field ISENABLED0 = Field.create("ISENABLED0", 8, FieldType.BIT, 0).setBaseOffset(1368); public static final Field[] VALUES = { DCOUTPUT0, ISENABLED0_INT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java index 3573a396c4..cc598c1274 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/ElectronicThrottle.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/electronic_throttle.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,23 +167,23 @@ public class ElectronicThrottle { public static final int PACK_MULT_VSS = 100; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1296); - public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1296); - public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1296); - public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1296); - public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1296); - public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1296); - public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1296); - public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1296); - public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1296); - public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1296); - public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1296); + public static final Field IDLEPOSITION = Field.create("IDLEPOSITION", 0, FieldType.FLOAT).setBaseOffset(1304); + public static final Field TRIM = Field.create("TRIM", 4, FieldType.FLOAT).setBaseOffset(1304); + public static final Field LUAADJUSTMENT = Field.create("LUAADJUSTMENT", 8, FieldType.FLOAT).setBaseOffset(1304); + public static final Field M_WASTEGATEPOSITION = Field.create("M_WASTEGATEPOSITION", 12, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBFEEDFORWARD = Field.create("ETBFEEDFORWARD", 16, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBINTEGRALERROR = Field.create("ETBINTEGRALERROR", 20, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBCURRENTTARGET = Field.create("ETBCURRENTTARGET", 24, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBCURRENTADJUSTEDTARGET = Field.create("ETBCURRENTADJUSTEDTARGET", 28, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBREVLIMITACTIVE = Field.create("ETBREVLIMITACTIVE", 32, FieldType.BIT, 0).setBaseOffset(1304); + public static final Field JAMDETECTED = Field.create("JAMDETECTED", 32, FieldType.BIT, 1).setBaseOffset(1304); + public static final Field ETBDUTYRATEOFCHANGE = Field.create("ETBDUTYRATEOFCHANGE", 36, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBDUTYAVERAGE = Field.create("ETBDUTYAVERAGE", 40, FieldType.FLOAT).setBaseOffset(1304); + public static final Field ETBTPSERRORCOUNTER = Field.create("ETBTPSERRORCOUNTER", 44, FieldType.INT16).setScale(1.0).setBaseOffset(1304); + public static final Field ETBPPSERRORCOUNTER = Field.create("ETBPPSERRORCOUNTER", 46, FieldType.INT16).setScale(1.0).setBaseOffset(1304); + public static final Field ETBERRORCODE = Field.create("ETBERRORCODE", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1304); + public static final Field JAMTIMER = Field.create("JAMTIMER", 50, FieldType.INT16).setScale(0.01).setBaseOffset(1304); public static final Field[] VALUES = { IDLEPOSITION, TRIM, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index 4113dc3881..59d1fe1f19 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:01:24 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition.jar based on (unknown script) integration/rusefi_config.txt Wed Aug 09 09:40:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1025,6 +1025,7 @@ public class Fields { public static final int SentEtbType_FORD_TYPE_1 = 2; public static final int SentEtbType_GM_TYPE_1 = 1; public static final int SentEtbType_NONE = 0; + public static final int SIGNATURE_HASH = 821563613; public static final String SIMULATOR_TUNE_BIN_FILE_NAME = "generated/simulator_tune_image.bin"; public static final int spi_device_e_SPI_DEVICE_1 = 1; public static final int spi_device_e_SPI_DEVICE_2 = 2; @@ -1249,10 +1250,10 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI master.2023.08.09.f407-discovery.2170697733"; + public static final String TS_SIGNATURE = "rusEFI master.2023.08.09.f407-discovery.821563613"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; - public static final int TS_TOTAL_OUTPUT_SIZE = 1392; + public static final int TS_TOTAL_OUTPUT_SIZE = 1400; public static final String TS_TRIGGER_SCOPE_CHANNEL_1_NAME = "Channel 1"; public static final String TS_TRIGGER_SCOPE_CHANNEL_2_NAME = "Channel 2"; public static final int TS_TRIGGER_SCOPE_DISABLE = 5; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java index 14b41ca800..c3da98f7cb 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/IdleState.java @@ -1,37 +1,37 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/idle_state.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class IdleState { - public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1256); - public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1256); - public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1256); - public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1256); - public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1256); - public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1256); - public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1256); - public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1256); - public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1256); - public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1256); - public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1256); - public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1256); - public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1256); - public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1256); - public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1256); - public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1256); - public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1256); - public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1256); - public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1256); - public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1256); - public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1256); - public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1256); - public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1256); + public static final Field IDLESTATE = Field.create("IDLESTATE", 0, FieldType.INT).setScale(1.0).setBaseOffset(1264); + public static final Field CURRENTIDLEPOSITION = Field.create("CURRENTIDLEPOSITION", 4, FieldType.FLOAT).setBaseOffset(1264); + public static final Field BASEIDLEPOSITION = Field.create("BASEIDLEPOSITION", 8, FieldType.FLOAT).setBaseOffset(1264); + public static final Field IACBYTPSTAPER = Field.create("IACBYTPSTAPER", 12, FieldType.FLOAT).setBaseOffset(1264); + public static final Field THROTTLEPEDALUPSTATE = Field.create("THROTTLEPEDALUPSTATE", 16, FieldType.INT).setScale(1.0).setBaseOffset(1264); + public static final Field MIGHTRESETPID = Field.create("MIGHTRESETPID", 20, FieldType.BIT, 0).setBaseOffset(1264); + public static final Field SHOULDRESETPID = Field.create("SHOULDRESETPID", 20, FieldType.BIT, 1).setBaseOffset(1264); + public static final Field WASRESETPID = Field.create("WASRESETPID", 20, FieldType.BIT, 2).setBaseOffset(1264); + public static final Field MUSTRESETPID = Field.create("MUSTRESETPID", 20, FieldType.BIT, 3).setBaseOffset(1264); + public static final Field ISCRANKING = Field.create("ISCRANKING", 20, FieldType.BIT, 4).setBaseOffset(1264); + public static final Field ISIACTABLEFORCOASTING = Field.create("ISIACTABLEFORCOASTING", 20, FieldType.BIT, 5).setBaseOffset(1264); + public static final Field NOTIDLING = Field.create("NOTIDLING", 20, FieldType.BIT, 6).setBaseOffset(1264); + public static final Field NEEDRESET = Field.create("NEEDRESET", 20, FieldType.BIT, 7).setBaseOffset(1264); + public static final Field ISINDEADZONE = Field.create("ISINDEADZONE", 20, FieldType.BIT, 8).setBaseOffset(1264); + public static final Field ISBLIPPING = Field.create("ISBLIPPING", 20, FieldType.BIT, 9).setBaseOffset(1264); + public static final Field USECLOSEDLOOP = Field.create("USECLOSEDLOOP", 20, FieldType.BIT, 10).setBaseOffset(1264); + public static final Field BADTPS = Field.create("BADTPS", 20, FieldType.BIT, 11).setBaseOffset(1264); + public static final Field LOOKSLIKERUNNING = Field.create("LOOKSLIKERUNNING", 20, FieldType.BIT, 12).setBaseOffset(1264); + public static final Field LOOKSLIKECOASTING = Field.create("LOOKSLIKECOASTING", 20, FieldType.BIT, 13).setBaseOffset(1264); + public static final Field LOOKSLIKECRANKTOIDLE = Field.create("LOOKSLIKECRANKTOIDLE", 20, FieldType.BIT, 14).setBaseOffset(1264); + public static final Field ISVERBOSEIAC = Field.create("ISVERBOSEIAC", 20, FieldType.BIT, 15).setBaseOffset(1264); + public static final Field ISIDLECOASTING = Field.create("ISIDLECOASTING", 20, FieldType.BIT, 16).setBaseOffset(1264); + public static final Field TARGETRPMBYCLT = Field.create("TARGETRPMBYCLT", 24, FieldType.INT).setScale(1.0).setBaseOffset(1264); + public static final Field TARGETRPMACBUMP = Field.create("TARGETRPMACBUMP", 28, FieldType.INT).setScale(1.0).setBaseOffset(1264); + public static final Field IACBYRPMTAPER = Field.create("IACBYRPMTAPER", 32, FieldType.FLOAT).setBaseOffset(1264); + public static final Field LUAADD = Field.create("LUAADD", 36, FieldType.FLOAT).setBaseOffset(1264); public static final Field[] VALUES = { IDLESTATE, CURRENTIDLEPOSITION, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java index 2341964e9d..ae95a70a72 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/LambdaMonitor.java @@ -1,15 +1,15 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/math/lambda_monitor.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class LambdaMonitor { - public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1384); - public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1384); - public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1384); - public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1384); + public static final Field LAMBDACURRENTLYGOOD = Field.create("LAMBDACURRENTLYGOOD", 0, FieldType.BIT, 0).setBaseOffset(1392); + public static final Field LAMBDAMONITORCUT = Field.create("LAMBDAMONITORCUT", 0, FieldType.BIT, 1).setBaseOffset(1392); + public static final Field LAMBDATIMESINCEGOOD = Field.create("LAMBDATIMESINCEGOOD", 4, FieldType.INT16).setScale(0.01).setBaseOffset(1392); + public static final Field ALIGNMENTFILL_AT_6 = Field.create("ALIGNMENTFILL_AT_6", 6, FieldType.INT8).setScale(1.0).setBaseOffset(1392); public static final Field[] VALUES = { LAMBDACURRENTLYGOOD, LAMBDAMONITORCUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java index 64d9a638d0..d70bee82b7 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/SentState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors/sent_state.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,9 +167,9 @@ public class SentState { public static final int PACK_MULT_VSS = 100; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1372); - public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1372); + public static final Field VALUE0 = Field.create("VALUE0", 0, FieldType.INT16).setScale(1.0).setBaseOffset(1380); + public static final Field VALUE1 = Field.create("VALUE1", 2, FieldType.INT16).setScale(1.0).setBaseOffset(1380); + public static final Field ERRORRATE = Field.create("ERRORRATE", 4, FieldType.FLOAT).setBaseOffset(1380); public static final Field[] VALUES = { VALUE0, VALUE1, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java index 0b817f7c0f..0d8030cc02 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerCentral.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_central.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -23,6 +23,8 @@ public class TriggerCentral { public static final Field TRIGGERTOOTHANGLEERROR = Field.create("TRIGGERTOOTHANGLEERROR", 44, FieldType.FLOAT).setBaseOffset(1168); public static final Field TRIGGERIGNOREDTOOTHCOUNT = Field.create("TRIGGERIGNOREDTOOTHCOUNT", 48, FieldType.INT8).setScale(1.0).setBaseOffset(1168); public static final Field ALIGNMENTFILL_AT_49 = Field.create("ALIGNMENTFILL_AT_49", 49, FieldType.INT8).setScale(1.0).setBaseOffset(1168); + public static final Field MAPCAMPREVTOOTHANGLE = Field.create("MAPCAMPREVTOOTHANGLE", 52, FieldType.FLOAT).setBaseOffset(1168); + public static final Field ISDECODINGMAPCAM = Field.create("ISDECODINGMAPCAM", 56, FieldType.BIT, 0).setBaseOffset(1168); public static final Field[] VALUES = { HWEVENTCOUNTERS1, HWEVENTCOUNTERS2, @@ -40,5 +42,7 @@ public class TriggerCentral { TRIGGERTOOTHANGLEERROR, TRIGGERIGNOREDTOOTHCOUNT, ALIGNMENTFILL_AT_49, + MAPCAMPREVTOOTHANGLE, + ISDECODINGMAPCAM, }; } diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index ed4cd55fc2..6c1195db48 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,15 +167,15 @@ public class TriggerState { public static final int PACK_MULT_VSS = 100; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1220); - public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1220); - public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1220); - public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1220); - public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 16, FieldType.FLOAT).setBaseOffset(1220); - public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1220); - public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 23, FieldType.INT8).setScale(1.0).setBaseOffset(1220); + public static final Field CRANKSYNCHRONIZATIONCOUNTER = Field.create("CRANKSYNCHRONIZATIONCOUNTER", 0, FieldType.INT).setScale(1.0).setBaseOffset(1228); + public static final Field VVTSYNCGAPRATIO = Field.create("VVTSYNCGAPRATIO", 4, FieldType.FLOAT).setBaseOffset(1228); + public static final Field VVTTOOTHDURATIONS0 = Field.create("VVTTOOTHDURATIONS0", 8, FieldType.INT).setScale(1.0).setBaseOffset(1228); + public static final Field VVTCURRENTPOSITION = Field.create("VVTCURRENTPOSITION", 12, FieldType.FLOAT).setBaseOffset(1228); + public static final Field TRIGGERSYNCGAPRATIO = Field.create("TRIGGERSYNCGAPRATIO", 16, FieldType.FLOAT).setBaseOffset(1228); + public static final Field TRIGGERSTATEINDEX = Field.create("TRIGGERSTATEINDEX", 20, FieldType.INT8).setScale(1.0).setBaseOffset(1228); + public static final Field VVTCOUNTER = Field.create("VVTCOUNTER", 21, FieldType.INT8).setScale(1.0).setBaseOffset(1228); + public static final Field CAMRESYNCCOUNTER = Field.create("CAMRESYNCCOUNTER", 22, FieldType.INT8).setScale(1.0).setBaseOffset(1228); + public static final Field VVTSTATEINDEX = Field.create("VVTSTATEINDEX", 23, FieldType.INT8).setScale(1.0).setBaseOffset(1228); public static final Field[] VALUES = { CRANKSYNCHRONIZATIONCOUNTER, VVTSYNCGAPRATIO, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 48600583f7..db430d68fd 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -167,7 +167,7 @@ public class TriggerStatePrimary { public static final int PACK_MULT_VSS = 100; public static final int TPS_2_BYTE_PACKING_MULT = 100; public static final int VE_BLEND_COUNT = 4; - public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1244); + public static final Field M_HASSYNCHRONIZEDPHASE = Field.create("M_HASSYNCHRONIZEDPHASE", 0, FieldType.BIT, 0).setBaseOffset(1252); public static final Field[] VALUES = { M_HASSYNCHRONIZEDPHASE, }; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java index e943f3d9ee..32579d7c7a 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/VvtState.java @@ -1,14 +1,14 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/actuators/vvt.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class VvtState { - public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1380); - public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1380); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1380); + public static final Field VVTTARGET = Field.create("VVTTARGET", 0, FieldType.INT16).setScale(0.1).setBaseOffset(1388); + public static final Field VVTOUTPUT = Field.create("VVTOUTPUT", 2, FieldType.INT8).setScale(0.5).setBaseOffset(1388); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1388); public static final Field[] VALUES = { VVTTARGET, VVTOUTPUT, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java index fc2f039401..35889bfc53 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WallFuelState.java @@ -1,13 +1,13 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/algo/wall_fuel_state.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WallFuelState { - public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1248); - public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1248); + public static final Field WALLFUELCORRECTION = Field.create("WALLFUELCORRECTION", 0, FieldType.FLOAT).setBaseOffset(1256); + public static final Field WALLFUEL = Field.create("WALLFUEL", 4, FieldType.FLOAT).setBaseOffset(1256); public static final Field[] VALUES = { WALLFUELCORRECTION, WALLFUEL, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java index f2c2834d54..0eae55ff46 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/WidebandController.java @@ -1,19 +1,19 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Tue Aug 08 09:10:42 UTC 2023 +// this file was generated automatically by rusEFI tool config_definition_base.jar based on (unknown script) controllers/sensors//wideband_state.txt Wed Aug 09 09:38:59 UTC 2023 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; public class WidebandController { - public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1348); - public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1348); - public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1348); - public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1348); - public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1348); + public static final Field FAULTCODE = Field.create("FAULTCODE", 0, FieldType.INT8).setScale(1.0).setBaseOffset(1356); + public static final Field HEATERDUTY = Field.create("HEATERDUTY", 1, FieldType.INT8).setScale(1.0).setBaseOffset(1356); + public static final Field PUMPDUTY = Field.create("PUMPDUTY", 2, FieldType.INT8).setScale(1.0).setBaseOffset(1356); + public static final Field ALIGNMENTFILL_AT_3 = Field.create("ALIGNMENTFILL_AT_3", 3, FieldType.INT8).setScale(1.0).setBaseOffset(1356); + public static final Field TEMPC = Field.create("TEMPC", 4, FieldType.INT16).setScale(1.0).setBaseOffset(1356); + public static final Field NERNSTVOLTAGE = Field.create("NERNSTVOLTAGE", 6, FieldType.INT16).setScale(0.001).setBaseOffset(1356); + public static final Field ESR = Field.create("ESR", 8, FieldType.INT16).setScale(1.0).setBaseOffset(1356); + public static final Field ALIGNMENTFILL_AT_10 = Field.create("ALIGNMENTFILL_AT_10", 10, FieldType.INT8).setScale(1.0).setBaseOffset(1356); public static final Field[] VALUES = { FAULTCODE, HEATERDUTY,